try adding intel lane

evaleev · Aug 30, 2023 · 68c0a13 · 68c0a13
1 parent 12f7605
commit 68c0a13
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -119,7 +119,7 @@ jobs:
       shell: bash
       working-directory: ${{github.workspace}}/build/library
       run: |
-        tar -xzvf ../compiler/libint-2*.tgz
+        tar -xzf ../compiler/libint-2*.tgz
         cd libint-2*
         echo "LIBINT_EXPORTED_DIR=`pwd`" >> $GITHUB_ENV
         cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython_EXECUTABLE=`which python3` $BUILD_CONFIG
@@ -166,9 +166,7 @@ jobs:
             lane: ubuntu-gnu
             libargs: >
               -DBUILD_SHARED_LIBS=ON
-              -DLIBINT2_LOCAL_Eigen3_INSTALL=ON
-              -DEigen3_ROOT="/usr/share/miniconda3/envs/onlyeigen/"
-            testargs: >
+            testargs: ""
               -DLIBINT2_LOCAL_Eigen3_FIND=ON
             # note full paths depend on setup-miniconda:
             # * Miniforge is miniconda3 vs. Miniconda is miniconda
@@ -179,16 +177,30 @@ jobs:
               -DBUILD_SHARED_LIBS=ON
             testargs: ""
 
-          #- runs-on: ubuntu-latest
-          #  lane: ubuntu-intel
+          #- runs-on: windows-latest
+          #  lane: windows-clang-cl
           #  libargs: >
-          #    -DCMAKE_CXX_COMPILER=icpx
-          #    -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr/share/miniconda3/envs/test --sysroot=/usr/share/miniconda3/envs/test/x86_64-conda-linux-gnu/sysroot -target x86_64-conda-linux-gnu"
-          #    # flags are long-form of below (envvars not available at spinup)
-          #    # -DCMAKE_CXX_FLAGS="--gcc-toolchain=${CONDA_PREFIX} --sysroot=${CONDA_PREFIX}/${HOST}/sysroot -target ${HOST}"
+          #    -GNinja
+          #    -DCMAKE_BUILD_TYPE=Release
+          #    -DBUILD_SHARED_LIBS=OFF
+          #    -DCMAKE_CXX_COMPILER=clang-cl
+          #    -DCMAKE_C_COMPILER=clang-cl
           #  testargs: >
-          #    -DCMAKE_CXX_COMPILER=icpx
-          #    -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr/share/miniconda3/envs/test --sysroot=/usr/share/miniconda3/envs/test/x86_64-conda-linux-gnu/sysroot -target x86_64-conda-linux-gnu"
+          #    -GNinja
+          #    -DCMAKE_BUILD_TYPE=Release
+          #    -DCMAKE_CXX_COMPILER=clang-cl
+          #    -DCMAKE_C_COMPILER=clang-cl
+
+          - runs-on: ubuntu-latest
+            lane: ubuntu-intel
+            libargs: >
+              -DCMAKE_CXX_COMPILER=icpx
+              -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr/share/miniconda3/envs/test --sysroot=/usr/share/miniconda3/envs/test/x86_64-conda-linux-gnu/sysroot -target x86_64-conda-linux-gnu"
+              # flags are long-form of below (envvars not available at spinup)
+              # -DCMAKE_CXX_FLAGS="--gcc-toolchain=${CONDA_PREFIX} --sysroot=${CONDA_PREFIX}/${HOST}/sysroot -target ${HOST}"
+            testargs: >
+              -DCMAKE_CXX_COMPILER=icpx
+              -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr/share/miniconda3/envs/test --sysroot=/usr/share/miniconda3/envs/test/x86_64-conda-linux-gnu/sysroot -target x86_64-conda-linux-gnu"
 
     name: "Export • ${{ matrix.cfg.lane }} • ${{ matrix.cfg.libargs }}"
     runs-on: ${{ matrix.cfg.runs-on }}
@@ -253,7 +265,7 @@ jobs:
     - name: Extract, Build, Install Libint Library
       shell: bash -l {0}
       run: |
-        tar -zxvf libint*tgz
+        tar -zxf libint*tgz
         mkdir libint && mv libint-2*/* libint/ && cd libint/
         cmake \
           -S. \

diff --git a/export/cmake/CMakeLists.txt.export b/export/cmake/CMakeLists.txt.export
@@ -480,8 +480,9 @@ configure_file(
         @ONLY
 )
 
-# configuration.h/cc define a string summary of capabilities. @ONLY is maximally deferred in case config2 changes the
+# In the future CMake switchover, configuration.h/cc define a string summary of capabilities. @ONLY is maximally deferred in case config2 changes the
 #   summary (as it used to when LIBINT_SHGSHELL_ORDERING was library-config-time selected).
+#configure_file(${PROJECT_SOURCE_DIR}/include/libint2/util/configuration.h.cmake.in ${PROJECT_BINARY_DIR}/include/libint2/util/configuration.h @ONLY)
 configure_file(src/configuration.cc.cmake.in ${PROJECT_BINARY_DIR}/src/configuration.cc @ONLY)
 
 configure_file(