From 27c6c36c5aebfcee1fff7338d0de3c7e21aef03a Mon Sep 17 00:00:00 2001 From: Christopher McBride Date: Wed, 28 Feb 2024 13:46:45 -0500 Subject: [PATCH 1/2] bump redis dep to 7.2.4 --- .github/workflows/run_tests.yml | 14 ++++++++++++-- smartsim/_core/_install/buildenv.py | 2 +- smartsim/_core/utils/redis.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 79466b902..b1f007319 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -54,10 +54,15 @@ jobs: fail-fast: false matrix: subset: [backends, slow_tests, group_a, group_b] - os: [macos-12, ubuntu-20.04] # Operating systems + os: [macos-12, macos-14, ubuntu-20.04] # Operating systems compiler: [8] # GNU compiler version rai: [1.2.7] # Redis AI versions - py_v: ['3.8', '3.9', '3.10', '3.11'] # Python versions + py_v: ["3.8", "3.9", "3.10", "3.11"] # Python versions + exclude: + - os: macos-14 + py_v: "3.9" + - os: macos-14 + py_v: "3.8" env: SMARTSIM_REDISAI: ${{ matrix.rai }} @@ -108,8 +113,13 @@ jobs: python -m pip install .[dev,ml] - name: Install ML Runtimes with Smart (with pt, tf, and onnx support) + if: contains( matrix.os, 'ubuntu' ) || contains( matrix.os, 'macos-12') run: smart build --device cpu --onnx -v + - name: Install ML Runtimes with Smart (no ONNX,TF on Apple Silicon) + if: contains( matrix.os, 'macos-14' ) + run: smart build --device cpu --no_tf -v + - name: Run mypy run: | python -m pip install .[mypy] diff --git a/smartsim/_core/_install/buildenv.py b/smartsim/_core/_install/buildenv.py index c100ac80e..cbf29c4b5 100644 --- a/smartsim/_core/_install/buildenv.py +++ b/smartsim/_core/_install/buildenv.py @@ -275,7 +275,7 @@ class Versioner: SMARTSIM_SUFFIX = get_env("SMARTSIM_SUFFIX", "") # Redis - REDIS = Version_(get_env("SMARTSIM_REDIS", "7.0.5")) + REDIS = Version_(get_env("SMARTSIM_REDIS", "7.2.4")) REDIS_URL = get_env("SMARTSIM_REDIS_URL", "https://github.com/redis/redis.git/") REDIS_BRANCH = get_env("SMARTSIM_REDIS_BRANCH", REDIS) diff --git a/smartsim/_core/utils/redis.py b/smartsim/_core/utils/redis.py index 3bcf1c1f2..e3500c093 100644 --- a/smartsim/_core/utils/redis.py +++ b/smartsim/_core/utils/redis.py @@ -69,7 +69,7 @@ def create_cluster(hosts: t.List[str], ports: t.List[int]) -> None: # cov-wlm redis_cli = CONFIG.database_cli cmd = [redis_cli, "--cluster", "create"] cmd += ip_list - cmd += ["--cluster-replicas", "0"] + cmd += ["--cluster-replicas", "0", "--cluster-yes"] returncode, out, err = execute_cmd(cmd, proc_input="yes", shell=False) if returncode != 0: From 119ba1eff82ecb5992490785ad747e529f19e9fc Mon Sep 17 00:00:00 2001 From: Christopher McBride Date: Thu, 29 Feb 2024 14:19:23 -0500 Subject: [PATCH 2/2] Update changelog --- doc/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/changelog.rst b/doc/changelog.rst index f84047f29..11c4a6da7 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -18,11 +18,14 @@ To be released at some future point in time Description +- Update the version of Redis from `7.0.4` to `7.2.4` - Update Experiment API typing - Fix publishing of development docs Detailed Notes +- Update Redis version to `7.2.4`. This change fixes an issue in the Redis + build scripts causing failures on Apple Silicon hosts. (SmartSim-PR507_) - The container which builds the documentation for every merge to develop was failing due to a lack of space within the container. This was fixed by including an additional Github action that removes some unneeded @@ -30,6 +33,7 @@ Detailed Notes (SmartSim-PR-PR504_) - Update the generic `t.Any` typehints in Experiment API. (SmartSim-PR501_) +.. _SmartSim-PR507: https://github.com/CrayLabs/SmartSim/pull/507 .. _SmartSim-PR504: https://github.com/CrayLabs/SmartSim/pull/504 .. _SmartSim-PR501: https://github.com/CrayLabs/SmartSim/pull/501