From ccfbd423dc7208cc62b3edeb4d424aefc02d20bc Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 13:20:41 -0700 Subject: [PATCH 01/15] Run CI on macOS --- .github/workflows/ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d46c2b7..630dca1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,30 +15,49 @@ defaults: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ${{ matrix.os }} + name: ${{ matrix.name }} strategy: fail-fast: false matrix: include: # Oldest supported versions - - enable_cuda: true + - name: Linux CUDA 10.2 + os: ubuntu-18.04 + enable_cuda: true cuda: "10.2.89" gcc: "8.5.0" nvcc: "10.2" python: "3.7" pytorch: "1.11.0" # Latest supported versions - - enable_cuda: true + - name: Linux CUDA 11.2 + os: ubuntu-18.04 + enable_cuda: true cuda: "11.2.2" gcc: "10.3.0" nvcc: "11.2" python: "3.10" pytorch: "1.11.0" # Without CUDA - - enable_cuda: false + - name: Linux no CUDA + os: ubuntu-18.04 + enable_cuda: false gcc: "10.3.0" python: "3.10" pytorch: "1.11.0" + # Intel Mac + - name: Mac Intel + os: macos-latest + enable_cuda: false + python: "3.10" + pytorch: "1.11.0" + # ARM Mac + - name: Mac ARM + os: M1-arm64 + enable_cuda: false + python: "3.10" + pytorch: "1.11.0" steps: - name: Check out From a651f068e7b10f1eefd0f7b23993f0ff57db9d97 Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 13:23:38 -0700 Subject: [PATCH 02/15] Remove ARM Mac --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 630dca1..935cd4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,12 +52,6 @@ jobs: enable_cuda: false python: "3.10" pytorch: "1.11.0" - # ARM Mac - - name: Mac ARM - os: M1-arm64 - enable_cuda: false - python: "3.10" - pytorch: "1.11.0" steps: - name: Check out From 0ecb38cf1b313351da5651948d40393f0b51ff71 Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 13:58:21 -0700 Subject: [PATCH 03/15] Fixes to CI script --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 935cd4f..7141187 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: environment.yml - name: Prepare dependencies (without CUDA) - if: ${{ !matrix.enable_cuda }} + if: ${{ 'ubuntu' in matrix.os and !matrix.enable_cuda }} run: | sed -i -e "/cudatoolkit/c\ # - cudatoolkit" \ -e "/gxx_linux-64/c\ - gxx_linux-64 ${{ matrix.gcc }}" \ @@ -90,6 +90,16 @@ jobs: -e "/pytorch-gpu/c\ - pytorch-cpu ${{ matrix.pytorch }}" \ environment.yml + - name: Prepare dependencies (Mac) + if: ${{ 'macos' in matrix.os }} + run: | + sed -i -e "/cudatoolkit/c\ # - cudatoolkit" \ + -e "/gxx_linux-64/c\ # - gxx_linux-64" \ + -e "/nvcc_linux-64/c\ # - nvcc_linux-64" \ + -e "/python/c\ - python ${{ matrix.python }}.*" \ + -e "/pytorch-gpu/c\ - pytorch-cpu ${{ matrix.pytorch }}" \ + environment.yml + - name: Show dependency file run: cat environment.yml From 7fc57d99742dc55e16e4397a2e9d131ee28d7558 Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 14:35:23 -0700 Subject: [PATCH 04/15] Fixed syntax --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7141187..4241758 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: environment.yml - name: Prepare dependencies (without CUDA) - if: ${{ 'ubuntu' in matrix.os and !matrix.enable_cuda }} + if: ${{ contains(matrix.os, 'ubuntu') && !matrix.enable_cuda }} run: | sed -i -e "/cudatoolkit/c\ # - cudatoolkit" \ -e "/gxx_linux-64/c\ - gxx_linux-64 ${{ matrix.gcc }}" \ @@ -91,7 +91,7 @@ jobs: environment.yml - name: Prepare dependencies (Mac) - if: ${{ 'macos' in matrix.os }} + if: ${{ contains(matrix.os, 'macos') }} run: | sed -i -e "/cudatoolkit/c\ # - cudatoolkit" \ -e "/gxx_linux-64/c\ # - gxx_linux-64" \ From 51462aa27d2bffbae30263879f94b586fb59dc46 Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 14:59:41 -0700 Subject: [PATCH 05/15] Mac uses POSIX sed instead of GNU sed --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4241758..1fc819d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,11 +93,11 @@ jobs: - name: Prepare dependencies (Mac) if: ${{ contains(matrix.os, 'macos') }} run: | - sed -i -e "/cudatoolkit/c\ # - cudatoolkit" \ - -e "/gxx_linux-64/c\ # - gxx_linux-64" \ - -e "/nvcc_linux-64/c\ # - nvcc_linux-64" \ - -e "/python/c\ - python ${{ matrix.python }}.*" \ - -e "/pytorch-gpu/c\ - pytorch-cpu ${{ matrix.pytorch }}" \ + sed -i -e "s/- cudatoolkit/# - cudatoolkit/" \ + -e "s/- gxx_linux-64/# - gxx_linux-64/" \ + -e "s/- nvcc_linux-64/# - nvcc_linux-64/" \ + -e "s/- python/- python ${{ matrix.python }}.*/" \ + -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml - name: Show dependency file From 6d16994f203c049c8784b193652ae6a2675d0d16 Mon Sep 17 00:00:00 2001 From: peastman Date: Thu, 28 Jul 2022 15:04:24 -0700 Subject: [PATCH 06/15] Another fix to sed syntax --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fc819d..584bd58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,12 +93,12 @@ jobs: - name: Prepare dependencies (Mac) if: ${{ contains(matrix.os, 'macos') }} run: | - sed -i -e "s/- cudatoolkit/# - cudatoolkit/" \ - -e "s/- gxx_linux-64/# - gxx_linux-64/" \ - -e "s/- nvcc_linux-64/# - nvcc_linux-64/" \ - -e "s/- python/- python ${{ matrix.python }}.*/" \ - -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ - environment.yml + sed -i '' -e "s/- cudatoolkit/# - cudatoolkit/" \ + -e "s/- gxx_linux-64/# - gxx_linux-64/" \ + -e "s/- nvcc_linux-64/# - nvcc_linux-64/" \ + -e "s/- python/- python ${{ matrix.python }}.*/" \ + -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ + environment.yml - name: Show dependency file run: cat environment.yml From 378a0d29f3582830ec94bbebdb5b083f6312feb9 Mon Sep 17 00:00:00 2001 From: peastman Date: Mon, 1 Aug 2022 12:52:11 -0700 Subject: [PATCH 07/15] Prevent installing sysroot_linux on Mac --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcc823f..e7c63ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,6 +96,7 @@ jobs: sed -i '' -e "s/- cudatoolkit/# - cudatoolkit/" \ -e "s/- gxx_linux-64/# - gxx_linux-64/" \ -e "s/- nvcc_linux-64/# - nvcc_linux-64/" \ + -e "s/- sysroot_linux-64/# - sysroot_linux-64/" \ -e "s/- python/- python ${{ matrix.python }}.*/" \ -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml From 40806942e94b11aa143d15e3599edf03ef29194f Mon Sep 17 00:00:00 2001 From: peastman Date: Mon, 1 Aug 2022 13:44:55 -0700 Subject: [PATCH 08/15] Removed extra version numbers from environment.yml --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 67dad34..3bf1388 100644 --- a/environment.yml +++ b/environment.yml @@ -9,6 +9,6 @@ dependencies: - nvcc_linux-64 11.2 - torchani 2.2.2 - pytest - - python 3.10.* - - pytorch-gpu 1.11.0 + - python + - pytorch-gpu - sysroot_linux-64 2.17 \ No newline at end of file From e95d1d4b9d6ea65da67ff0cd4652de21ec56f8d7 Mon Sep 17 00:00:00 2001 From: peastman Date: Fri, 5 Aug 2022 14:28:13 -0700 Subject: [PATCH 09/15] Debugging --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7c63ab..110b34f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,7 @@ jobs: -DENABLE_CUDA=${{ matrix.enable_cuda }} \ -DTorch_DIR=$CONDA_PREFIX/lib/python${{ matrix.python }}/site-packages/torch/share/cmake/Torch \ -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX + cat CMakeCache.txt make install - name: Test From cb6521d277200c8623da3e8fb11832aade8d1866 Mon Sep 17 00:00:00 2001 From: peastman Date: Sun, 7 Aug 2022 13:33:39 -0700 Subject: [PATCH 10/15] Debugging --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 110b34f..6cf435e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,8 @@ jobs: -e "s/- python/- python ${{ matrix.python }}.*/" \ -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml + printenv DYLD_LIBRARY_PATH + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib - name: Show dependency file run: cat environment.yml @@ -114,6 +116,7 @@ jobs: - name: Configure, compile, and install run: | + printenv DYLD_LIBRARY_PATH conda activate nnpops mkdir build && cd build cmake .. \ From bd061ee5be096d2fa0873db167326e6e4484ad07 Mon Sep 17 00:00:00 2001 From: peastman Date: Sun, 7 Aug 2022 14:21:43 -0700 Subject: [PATCH 11/15] Debugging --- .github/workflows/ci.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cf435e..14f87b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,8 +100,15 @@ jobs: -e "s/- python/- python ${{ matrix.python }}.*/" \ -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml - printenv DYLD_LIBRARY_PATH - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib + + - name: printenv + run: printenv DYLD_LIBRARY_PATH + + - name: export + run: export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib + + - name: printenv2 + run: printenv DYLD_LIBRARY_PATH - name: Show dependency file run: cat environment.yml @@ -116,7 +123,6 @@ jobs: - name: Configure, compile, and install run: | - printenv DYLD_LIBRARY_PATH conda activate nnpops mkdir build && cd build cmake .. \ From 89bc97377693563bb2bc92337c00dca5df69cbc4 Mon Sep 17 00:00:00 2001 From: peastman Date: Sun, 7 Aug 2022 15:03:01 -0700 Subject: [PATCH 12/15] Debugging --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14f87b0..b2a7075 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,13 +102,13 @@ jobs: environment.yml - name: printenv - run: printenv DYLD_LIBRARY_PATH + run: echo $DYLD_LIBRARY_PATH - name: export run: export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib - name: printenv2 - run: printenv DYLD_LIBRARY_PATH + run: echo $DYLD_LIBRARY_PATH - name: Show dependency file run: cat environment.yml From b00cb7dc57af2748d5a223c81b57bad9b111b509 Mon Sep 17 00:00:00 2001 From: peastman Date: Sun, 7 Aug 2022 16:44:41 -0700 Subject: [PATCH 13/15] Debugging --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2a7075..6f29f9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,14 +101,10 @@ jobs: -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml - - name: printenv - run: echo $DYLD_LIBRARY_PATH - - name: export - run: export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib - - - name: printenv2 - run: echo $DYLD_LIBRARY_PATH + run: | + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib + echo $DYLD_LIBRARY_PATH - name: Show dependency file run: cat environment.yml @@ -123,6 +119,7 @@ jobs: - name: Configure, compile, and install run: | + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib conda activate nnpops mkdir build && cd build cmake .. \ From dfe17713911d6668f404ba23c587bfb62353e4c5 Mon Sep 17 00:00:00 2001 From: peastman Date: Sun, 7 Aug 2022 17:06:32 -0700 Subject: [PATCH 14/15] Debugging --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f29f9f..cd02137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,10 @@ jobs: - name: export run: | + echo "Prefix" + echo $CONDA_PREFIX export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib + echo "PATH" echo $DYLD_LIBRARY_PATH - name: Show dependency file @@ -119,7 +122,7 @@ jobs: - name: Configure, compile, and install run: | - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib + export DYLD_LIBRARY_PATH=/Users/runner/miniconda3/envs/nnpops/lib conda activate nnpops mkdir build && cd build cmake .. \ From 06c0e50d2801f01a352fcd70b9f3a9944901d37e Mon Sep 17 00:00:00 2001 From: peastman Date: Mon, 8 Aug 2022 15:07:52 -0700 Subject: [PATCH 15/15] Debugging --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd02137..3c5e9c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,14 +101,6 @@ jobs: -e "s/- pytorch-gpu/- pytorch-cpu ${{ matrix.pytorch }}/" \ environment.yml - - name: export - run: | - echo "Prefix" - echo $CONDA_PREFIX - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$CONDA_PREFIX/lib - echo "PATH" - echo $DYLD_LIBRARY_PATH - - name: Show dependency file run: cat environment.yml @@ -122,7 +114,6 @@ jobs: - name: Configure, compile, and install run: | - export DYLD_LIBRARY_PATH=/Users/runner/miniconda3/envs/nnpops/lib conda activate nnpops mkdir build && cd build cmake .. \ @@ -130,7 +121,7 @@ jobs: -DTorch_DIR=$CONDA_PREFIX/lib/python${{ matrix.python }}/site-packages/torch/share/cmake/Torch \ -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX cat CMakeCache.txt - make install + make VERBOSE=1 install - name: Test run: |