diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb07ff9f..3bf507bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: fail-fast: false matrix: include: - - name: ubu22-gcc12-clang16 + - name: ubu22-gcc12-clang17 os: ubuntu-22.04 compiler: gcc-12 - clang-runtime: '16' + clang-runtime: '17' steps: - uses: actions/checkout@v3 with: @@ -188,8 +188,7 @@ jobs: -DCMAKE_INSTALL_LIBDIR=lib -DLLVM_DIR=$PATH_TO_LLVM_BUILD \ -DLLVM_CONFIG_EXTRA_PATH_HINTS=$PATH_TO_LLVM_BUILD \ -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR \ - -DLLVM_USE_LINKER=gold \ - -DLLVM_REQUIRED_VERSION=${{ matrix.clang-runtime }} .. + -DLLVM_USE_LINKER=gold .. make install - name: Setup tmate session if: ${{ failure() }} diff --git a/Dockerfile b/Dockerfile index 209250a6..424ff0e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -300,15 +300,15 @@ RUN \ # # Build and Install Clad # - git clone --depth=1 https://github.com/vgvassilev/clad.git && \ - cd clad && \ - mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug .. -DClang_DIR=${PATH_TO_LLVM_BUILD}/lib/cmake/clang/ -DLLVM_DIR=${PATH_TO_LLVM_BUILD}/lib/cmake/llvm/ -DCMAKE_INSTALL_PREFIX=${CONDA_DIR} -DLLVM_EXTERNAL_LIT="$(which lit)" && \ - make -j$(nproc --all) && \ - make install && \ - # install clad in all exist kernels - for i in "$KERNEL_PYTHON_PREFIX"/share/jupyter/kernels/*; do if [[ $i =~ .*/clad-xcpp.* ]]; then jq '.argv += ["-fplugin=$KERNEL_PYTHON_PREFIX/lib/clad.so"] | .display_name += " (with clad)"' "$i"/kernel.json > tmp.$$.json && mv tmp.$$.json "$i"/kernel.json; fi; done && \ + ##git clone --depth=1 https://github.com/vgvassilev/clad.git && \ + ##cd clad && \ + ##mkdir build && \ + ##cd build && \ + ##cmake -DCMAKE_BUILD_TYPE=Debug .. -DClang_DIR=${PATH_TO_LLVM_BUILD}/lib/cmake/clang/ -DLLVM_DIR=${PATH_TO_LLVM_BUILD}/lib/cmake/llvm/ -DCMAKE_INSTALL_PREFIX=${CONDA_DIR} -DLLVM_EXTERNAL_LIT="$(which lit)" && \ + ##make -j$(nproc --all) && \ + ##make install && \ + ### install clad in all exist kernels + ##for i in "$KERNEL_PYTHON_PREFIX"/share/jupyter/kernels/*; do if [[ $i =~ .*/clad-xcpp.* ]]; then jq '.argv += ["-fplugin=$KERNEL_PYTHON_PREFIX/lib/clad.so"] | .display_name += " (with clad)"' "$i"/kernel.json > tmp.$$.json && mv tmp.$$.json "$i"/kernel.json; fi; done && \ # # Add OpenMP to all kernels #