From 64c2119bef12f69bded6768788fb2599c0f2ea12 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Tue, 9 Apr 2024 08:47:39 -0700 Subject: [PATCH 1/6] Update to latest Ubuntu LTS 24.04, Python 3.12 --- server-base.hcl | 4 ++-- server-slim-base.hcl | 2 +- server-slim.hcl | 2 +- server.hcl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server-base.hcl b/server-base.hcl index 2f0a0c3..c6a880b 100644 --- a/server-base.hcl +++ b/server-base.hcl @@ -35,11 +35,11 @@ variable "OPENJDK_VERSION" { } variable "PYTHON_VERSION" { - default = "3.10" + default = "3.12" } variable "UBUNTU_VERSION" { - default = "22.04" + default = "24.04" } variable "GRPC_HEALTH_PROBE_VERSION" { diff --git a/server-slim-base.hcl b/server-slim-base.hcl index 105d5c0..2170efb 100644 --- a/server-slim-base.hcl +++ b/server-slim-base.hcl @@ -23,7 +23,7 @@ variable "OPENJDK_VERSION" { } variable "UBUNTU_VERSION" { - default = "22.04" + default = "24.04" } variable "GRPC_HEALTH_PROBE_VERSION" { diff --git a/server-slim.hcl b/server-slim.hcl index 5766316..38fe866 100644 --- a/server-slim.hcl +++ b/server-slim.hcl @@ -33,7 +33,7 @@ variable "OPENJDK_VERSION" { } variable "UBUNTU_VERSION" { - default = "22.04" + default = "24.04" } variable "GRPC_HEALTH_PROBE_VERSION" { diff --git a/server.hcl b/server.hcl index 04f75a0..cb2746c 100644 --- a/server.hcl +++ b/server.hcl @@ -48,11 +48,11 @@ variable "OPENJDK_VERSION" { } variable "PYTHON_VERSION" { - default = "3.10" + default = "3.12" } variable "UBUNTU_VERSION" { - default = "22.04" + default = "24.04" } variable "GRPC_HEALTH_PROBE_VERSION" { From d35ba0c484c00755eb23d1e534d93dae5262e41b Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 9 May 2024 11:55:16 -0700 Subject: [PATCH 2/6] Disable tensorflow-related builds h5py is unable to be installed on our arm64 images, see https://github.com/h5py/h5py/issues/2408 --- server-base.hcl | 4 ++-- server.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server-base.hcl b/server-base.hcl index c6a880b..a02b211 100644 --- a/server-base.hcl +++ b/server-base.hcl @@ -8,11 +8,11 @@ group "default" { # explicitly depend on deephaven-core. group "extra" { targets = [ - "server-base-all-ai", + //"server-base-all-ai", "server-base-nltk", "server-base-pytorch", "server-base-sklearn", - "server-base-tensorflow" + //"server-base-tensorflow" ] } diff --git a/server.hcl b/server.hcl index 75eb8a7..976811f 100644 --- a/server.hcl +++ b/server.hcl @@ -6,11 +6,11 @@ group "default" { group "extra" { targets = [ - "server-all-ai", + //"server-all-ai", "server-nltk", "server-pytorch", "server-sklearn", - "server-tensorflow", + //"server-tensorflow", "server-ui" ] } From aa2afda1cee7e3a428042fadb4ae943f5c352beb Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Wed, 26 Jun 2024 08:12:23 -0700 Subject: [PATCH 3/6] Remove all non-essential images --- .github/workflows/release-ci.yml | 3 ++- server-base.hcl | 10 +++++----- server.hcl | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 0170e70..79d5244 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -32,7 +32,8 @@ jobs: - name: Bake uses: docker/bake-action@v5.1.0 with: - targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui + # targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui + targets: server,server-slim,server-ui files: server.hcl,server-slim.hcl pull: true env: diff --git a/server-base.hcl b/server-base.hcl index d8be38e..4903b34 100644 --- a/server-base.hcl +++ b/server-base.hcl @@ -8,11 +8,11 @@ group "default" { # explicitly depend on deephaven-core. group "extra" { targets = [ - //"server-base-all-ai", - "server-base-nltk", - "server-base-pytorch", - "server-base-sklearn", - //"server-base-tensorflow" + // "server-base-all-ai", + // "server-base-nltk", + // "server-base-pytorch", + // "server-base-sklearn", + // "server-base-tensorflow" ] } diff --git a/server.hcl b/server.hcl index e30c86f..e0ed71f 100644 --- a/server.hcl +++ b/server.hcl @@ -6,11 +6,11 @@ group "default" { group "extra" { targets = [ - //"server-all-ai", - "server-nltk", - "server-pytorch", - "server-sklearn", - //"server-tensorflow", + // "server-all-ai", + // "server-nltk", + // "server-pytorch", + // "server-sklearn", + // "server-tensorflow", "server-ui" ] } From 216b0c702ab45c8aaedc60e310688bca1ba1f2ea Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Wed, 7 Aug 2024 11:49:03 -0700 Subject: [PATCH 4/6] re-enable extra ai images --- .github/workflows/release-ci.yml | 3 +-- server-base.hcl | 10 +++++----- server.hcl | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 8733bd4..5bba443 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -32,8 +32,7 @@ jobs: - name: Bake uses: docker/bake-action@v5.4.0 with: - # targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui - targets: server,server-slim,server-ui + targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui files: server.hcl,server-slim.hcl pull: true env: diff --git a/server-base.hcl b/server-base.hcl index 4903b34..0aba6b0 100644 --- a/server-base.hcl +++ b/server-base.hcl @@ -8,11 +8,11 @@ group "default" { # explicitly depend on deephaven-core. group "extra" { targets = [ - // "server-base-all-ai", - // "server-base-nltk", - // "server-base-pytorch", - // "server-base-sklearn", - // "server-base-tensorflow" + "server-base-all-ai", + "server-base-nltk", + "server-base-pytorch", + "server-base-sklearn", + "server-base-tensorflow" ] } diff --git a/server.hcl b/server.hcl index e29bf0f..11a8975 100644 --- a/server.hcl +++ b/server.hcl @@ -6,11 +6,11 @@ group "default" { group "extra" { targets = [ - // "server-all-ai", - // "server-nltk", - // "server-pytorch", - // "server-sklearn", - // "server-tensorflow", + "server-all-ai", + "server-nltk", + "server-pytorch", + "server-sklearn", + "server-tensorflow", "server-ui" ] } From 2ebf7183f4022811f219db8864c8aa88abad96ab Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 26 Sep 2024 14:43:57 -0700 Subject: [PATCH 5/6] retrigger From bf4a5c550dee3cd9ee1b239036413e6de78466be Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Tue, 8 Oct 2024 14:37:21 -0700 Subject: [PATCH 6/6] Include numba for python 3.12 Follow-up to https://github.com/deephaven/deephaven-core/pull/5130 --- contexts/server-base/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contexts/server-base/requirements.txt b/contexts/server-base/requirements.txt index 1187a56..10a64d2 100644 --- a/contexts/server-base/requirements.txt +++ b/contexts/server-base/requirements.txt @@ -9,7 +9,7 @@ deephaven-plugin>=0.6.0 numpy pandas>=1.5.0 pyarrow -numba; python_version < "3.12" +numba; python_version < "3.13" # deephaven-core also expects wheel to be installed... wheel