fixup! Add support for TensorFlow 2.16

nengo · Mar 28, 2024 · caee247 · caee247
1 parent 3db6004
commit caee247
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 39 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,41 +34,41 @@ jobs:
   test:
     needs:
       - static
-    runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       matrix:
         include:
-          - script: remote-test
-            coverage-name: remote
+          - script: test
+            coverage-name: gpu
             tf-version: tensorflow==2.10
+            runs-on: [self-hosted, gpu]
           - script: test
             python-version: "3.11"
             coverage-name: latest
           - script: test
             tf-version: tensorflow~=2.6.0
             python-version: "3.8"
             coverage-name: oldest
-          - script: remote-docs
+          - script: docs
             tf-version: tensorflow==2.10
             python-version: "3.9"
-          - script: remote-examples
+            runs-on: [self-hosted, gpu]
+          - script: examples
             tf-version: tensorflow==2.10
+            runs-on: [self-hosted, gpu]
       fail-fast: false
     env:
       TF_VERSION: ${{ matrix.tf-version || 'tensorflow' }}
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      SSH_CONFIG: ${{ secrets.SSH_CONFIG }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+    runs-on: ${{ matrix.runs-on || 'ubuntu-latest' }}
     steps:
       - uses: nengo/nengo-bones/actions/setup@main
         with:
           python-version: ${{ matrix.python-version || '3.10' }}
       - uses: nengo/nengo-bones/actions/generate-and-check@main
-      - name: Write secrets to file
+      - name: Install TensorFlow with GPU support
+        if: ${{ contains(matrix.runs-on, 'gpu') }}
         run: |
-          mkdir -p ~/.ssh
-          echo '${{ secrets.AZURE_PEM }}' > ~/.ssh/azure.pem
+          micromamba install -y "$TF_VERSION" cudnn=8.4
       - uses: nengo/nengo-bones/actions/run-script@main
         with:
           name: ${{ matrix.script }}

diff --git a/.nengobones.yml b/.nengobones.yml
@@ -17,6 +17,7 @@ manifest_in: {}
 
 setup_py:
   install_req:
+    - anyio<4  # not compatible with older tensorflow versions
     - packaging>=20.9
     - scipy>=1.0.0
     - tensorflow>=2.6.0
@@ -71,34 +72,6 @@ ci_scripts:
     coverage: true
     pip_install:
       - $TF_VERSION
-  - template: remote-script
-    remote_script: test
-    output_name: remote-test
-    host: azure
-    azure_name: nengo-dl
-    azure_group: nengo-ci
-    coverage: true
-    remote_vars:
-      TF_FORCE_GPU_ALLOW_GROWTH: "true"
-      TF_VERSION: $TF_VERSION
-    remote_setup:
-      - micromamba install -y "$TF_VERSION" cudnn=8.4
-  - template: remote-script
-    remote_script: docs
-    output_name: remote-docs
-    host: azure-docs
-    azure_name: nengo-dl-docs
-    azure_group: nengo-ci
-    remote_setup:
-      - micromamba install -y "$TF_VERSION" cudnn=8.4
-  - template: remote-script
-    remote_script: examples
-    output_name: remote-examples
-    host: azure-examples
-    azure_name: nengo-dl-examples
-    azure_group: nengo-ci
-    remote_setup:
-      - micromamba install -y "$TF_VERSION" cudnn=8.4
   - template: deploy
     wheel: true
 

diff --git a/setup.py b/setup.py
@@ -28,6 +28,7 @@ def read(*filenames, **kwargs):
 version = runpy.run_path(str(root / "keras_lmu" / "version.py"))["version"]
 
 install_req = [
+    "anyio<4",
     "packaging>=20.9",
     "scipy>=1.0.0",
     "tensorflow>=2.6.0",