Install h5py after tensorflow

Signed-off-by: Enrico Minack <github@enrico.minack.dev>
horovod · Dec 8, 2021 · 5158adb · 5158adb
1 parent b22fa16
commit 5158adb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/gen-workflow-ci.py b/.github/gen-workflow-ci.py
@@ -503,8 +503,8 @@ def build_and_test_macos(id: str, name: str, needs: List[str], attempts: int = 3
                 f'          python --version\n'
                 f'\n'
                 f'          python -m pip install -U pip\n'
-                f'          if [[ ${{TENSORFLOW}} == 1.* ]] || [[ ${{TENSORFLOW}} == 2.[012345].* ]]; then h5py="h5py<3"; fi\n'
-                f'          pip install tensorflow==${{TENSORFLOW}} keras==${{KERAS}} ${{h5py:-}}\n'
+                f'          pip install tensorflow==${{TENSORFLOW}} keras==${{KERAS}}\n'
+                f'          if [[ ${{TENSORFLOW}} == 1.* ]] || [[ ${{TENSORFLOW}} == 2.[012345].* ]]; then pip install "h5py<3"; fi\n'
                 f'          pip install torch==${{PYTORCH}} pytorch_lightning==${{PYTORCH_LIGHTNING}} torchvision==${{TORCHVISION}}\n'
                 f'          pip install mxnet==${{MXNET}}\n'
                 f'          HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITH_MXNET=1 pip install --no-cache-dir .[test]\n'

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3414,8 +3414,8 @@ jobs:
           python --version
 
           python -m pip install -U pip
-          if [[ ${TENSORFLOW} == 1.* ]] || [[ ${TENSORFLOW} == 2.[012345].* ]]; then h5py="h5py<3"; fi
-          pip install tensorflow==${TENSORFLOW} keras==${KERAS} ${h5py:-}
+          pip install tensorflow==${TENSORFLOW} keras==${KERAS}
+          if [[ ${TENSORFLOW} == 1.* ]] || [[ ${TENSORFLOW} == 2.[012345].* ]]; then pip install "h5py<3"; fi
           pip install torch==${PYTORCH} pytorch_lightning==${PYTORCH_LIGHTNING} torchvision==${TORCHVISION}
           pip install mxnet==${MXNET}
           HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITH_MXNET=1 pip install --no-cache-dir .[test]