Try switching to llvm17

compiler-research · Sep 12, 2023 · 773323f · 773323f
1 parent ad94a0a
commit 773323f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -60,8 +60,6 @@ ENV LC_ALL=en_US.UTF-8 \
 
 USER ${NB_UID}
 
-ENV LLVM_REQUIRED_VERSION=16
-
 # Copy git repository to home directory of container
 COPY --chown=${NB_UID}:${NB_GID} . "${HOME}"/
 
@@ -124,7 +122,6 @@ RUN \
     # notebook, jpyterhub, jupyterlab are inherited from base-notebook container image
     # Other "our" conda installs
     cmake \
-    #"clangdev=$LLVM_REQUIRED_VERSION" \
     'xeus>=2.0,<3.0' \
     'nlohmann_json>=3.9.1,<3.10' \
     'cppzmq>=4.6.0,<5' \
@@ -294,7 +291,7 @@ RUN \
     export CPLUS_INCLUDE_PATH="/home/jovyan/clad/include:$CPLUS_INCLUDE_PATH" && \
     echo "export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> ~/.profile && \
     ##echo "conda activate .venv" >> ~/.profile
-    cmake -DCMAKE_BUILD_TYPE=Debug -DLLVM_CMAKE_DIR=$PATH_TO_LLVM_BUILD -DCMAKE_PREFIX_PATH=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_PREFIX=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_LIBDIR=lib -DLLVM_CONFIG_EXTRA_PATH_HINTS=${PATH_TO_LLVM_BUILD}/lib -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR -DLLVM_REQUIRED_VERSION=$LLVM_REQUIRED_VERSION -DLLVM_USE_LINKER=gold .. && \
+    cmake -DCMAKE_BUILD_TYPE=Debug -DLLVM_CMAKE_DIR=$PATH_TO_LLVM_BUILD -DCMAKE_PREFIX_PATH=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_PREFIX=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_LIBDIR=lib -DLLVM_CONFIG_EXTRA_PATH_HINTS=${PATH_TO_LLVM_BUILD}/lib -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR -DLLVM_USE_LINKER=gold .. && \
     make install -j$(nproc --all) && \
     cd .. && \
     #