From f85ecbe95b09de05b2f5ebe11274b7e2475efbe2 Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Fri, 13 Sep 2024 09:47:14 -0700 Subject: [PATCH 1/5] Add missing backslash Signed-off-by: Dan Bailey --- .github/workflows/houdini.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 14eac43ec2..b30fd4dcc4 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -176,7 +176,7 @@ jobs: -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DUSE_EXPLICIT_INSTANTIATION=OFF \ -DLLVM_DIR=/usr/local/opt/llvm@15/lib/cmake/llvm \ - -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \ \" - name: test run: cd build && ctest -V From c04d4cf7d7fe92eeb68e1ebe1c750384833326e7 Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Fri, 13 Sep 2024 10:30:22 -0700 Subject: [PATCH 2/5] Use homebrew version of bash instead of mac version Signed-off-by: Dan Bailey --- ci/install_macos.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/install_macos.sh b/ci/install_macos.sh index 7707dbb1e9..644e2aab5f 100755 --- a/ci/install_macos.sh +++ b/ci/install_macos.sh @@ -31,6 +31,10 @@ echo "Using python $py_version" echo "Python_ROOT_DIR=/usr/local/opt/$py_version" >> $GITHUB_ENV echo "/usr/local/opt/$py_version/bin" >> $GITHUB_PATH +# use bash +echo "/usr/local/opt/bash/bin" >> $GITHUB_PATH +echo "/opt/homebrew/opt/bash/bin" >> $GITHUB_PATH + # use gnu-getopt echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH echo "/opt/homebrew/opt/gnu-getopt/bin" >> $GITHUB_PATH From cd17db1aad3ca75bbb3c721f97068dcb9ab4325d Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Fri, 13 Sep 2024 10:59:58 -0700 Subject: [PATCH 3/5] Update llvm paths for Apple silicon homebrew paths Signed-off-by: Dan Bailey --- .github/workflows/houdini.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index b30fd4dcc4..076e5ba670 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -162,7 +162,7 @@ jobs: cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd - - name: install_deps - run: ./ci/install_macos.sh ${{ matrix.config.llvm }} + run: ./ci/install_macos.sh 15 - name: build run: | ./ci/build.sh -v \ @@ -175,7 +175,7 @@ jobs: -DDISABLE_CMAKE_SEARCH_PATHS=ON \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DUSE_EXPLICIT_INSTANTIATION=OFF \ - -DLLVM_DIR=/usr/local/opt/llvm@15/lib/cmake/llvm \ + -DLLVM_DIR=/opt/homebrew/opt/llvm@15/lib/cmake/llvm \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \ \" - name: test From d90e61f5ee2b41130a50e831168f6f3ff7979502 Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Fri, 13 Sep 2024 13:13:47 -0700 Subject: [PATCH 4/5] Use Apple Silicon Houdini Downloads and Houdini tbb instead of homebrew tbb Signed-off-by: Dan Bailey --- .github/workflows/houdini.yml | 1 + .github/workflows/weekly.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 076e5ba670..5b0fadac31 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -175,6 +175,7 @@ jobs: -DDISABLE_CMAKE_SEARCH_PATHS=ON \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DUSE_EXPLICIT_INSTANTIATION=OFF \ + -DTbb_INCLUDE_DIR=$HOME/houdini_install/hou/Frameworks/Houdini.framework/Versions/Current/Resources/toolkit/include/tbb \ -DLLVM_DIR=/opt/homebrew/opt/llvm@15/lib/cmake/llvm \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \ \" diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 8b422b2925..479b236e44 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -127,7 +127,7 @@ jobs: id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - name: download_houdini - run: ./ci/download_houdini.sh 20.0 macosx_x86_64_clang12.0_11 --prod + run: ./ci/download_houdini.sh 20.0 macosx_arm64_clang14.0_13 --prod - name: install_houdini run: | mkdir $HOME/houdini_install From ac497c2d12a713d2c2780b279600d226814f76b9 Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Fri, 13 Sep 2024 13:13:47 -0700 Subject: [PATCH 5/5] Install tbb in CI only when not building for Houdini Signed-off-by: Dan Bailey --- .github/workflows/ax.yml | 4 +++- .github/workflows/build.yml | 4 +++- .github/workflows/houdini.yml | 2 +- .github/workflows/nanovdb.yml | 4 +++- .github/workflows/weekly.yml | 5 ++++- ci/install_macos.sh | 1 - ci/install_tbb_macos.sh | 6 ++++++ 7 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 ci/install_tbb_macos.sh diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml index 4ec09b32c9..a37c972f0a 100644 --- a/.github/workflows/ax.yml +++ b/.github/workflows/ax.yml @@ -134,7 +134,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: install_deps - run: ./ci/install_macos.sh ${{ matrix.config.llvm }} + run: | + ./ci/install_macos.sh ${{ matrix.config.llvm }} + ./ci/install_tbb_macos.sh - name: build run: > ./ci/build.sh -v diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d185ac306f..616f394910 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,7 +197,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: install - run: ./ci/install_macos.sh + run: | + ./ci/install_macos.sh + ./ci/install_tbb_macos.sh - name: build run: > ./ci/build.sh -v diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 5b0fadac31..f995a49704 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -167,7 +167,7 @@ jobs: run: | ./ci/build.sh -v \ --build-type=Release \ - --components="core,hou,bin,view,render,python,test,axcore,axbin,axtest" \ + --components="core,hou,bin,view,render,python,test,axcore,axbin" \ --cargs=\" \ -DHOUDINI_ROOT=$HOME/houdini_install/hou \ -DOPENVDB_BUILD_HOUDINI_ABITESTS=OFF \ diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml index 3617be9562..99a53c3921 100644 --- a/.github/workflows/nanovdb.yml +++ b/.github/workflows/nanovdb.yml @@ -167,7 +167,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: install_deps - run: ./ci/install_macos.sh + run: | + ./ci/install_macos.sh + ./ci/install_tbb_macos.sh - name: build run: > ./ci/build.sh -v diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 479b236e44..081c24789c 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -216,6 +216,7 @@ jobs: sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-dev libgtest-dev libcppunit-dev pybind11-dev elif [ "$RUNNER_OS" == "macOS" ]; then ./ci/install_macos.sh 15 + ./ci/install_tbb_macos.sh else echo "$RUNNER_OS not supported"; exit 1 fi @@ -317,7 +318,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: install_deps - run: ./ci/install_macos.sh ${{ matrix.config.llvm }} + run: | + ./ci/install_macos.sh ${{ matrix.config.llvm }} + ./ci/install_tbb_macos.sh - name: build run: > ./ci/build.sh -v diff --git a/ci/install_macos.sh b/ci/install_macos.sh index 644e2aab5f..0d7899687d 100755 --- a/ci/install_macos.sh +++ b/ci/install_macos.sh @@ -19,7 +19,6 @@ brew install googletest brew install jq # for trivial parsing of brew json brew install openexr brew install pybind11 # also installs the dependent python version -brew install tbb brew install zlib brew install jemalloc diff --git a/ci/install_tbb_macos.sh b/ci/install_tbb_macos.sh new file mode 100755 index 0000000000..4b71fe9e93 --- /dev/null +++ b/ci/install_tbb_macos.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -x + +brew update +brew install tbb