merge main into release/2025.03.x (#856)

Author: tdavidcl

.github/workflows/shamrock-acpp-clang.yml

@@ -103,11 +103,18 @@ jobs:
           cd build
           source ./activate && shamconfigure
 
-      - name: Build
+      - name: Configure sham install
         shell: bash # In docker container github action default to sh
         run: |
           cd build
-          source ./activate && shammake
+          source ./activate &&  \
+            cmake . -DCMAKE_INSTALL_PREFIX=$(pwd)/install_test
+
+      - name: Build & install
+        shell: bash # In docker container github action default to sh
+        run: |
+          cd build
+          source ./activate && shammake install
 
       - name: Pull reference files
         run: |
@@ -151,3 +158,11 @@ jobs:
         run: |
           cd build
           mpirun --allow-run-as-root --bind-to socket:overload-allowed --oversubscribe -n 4 ./shamrock_test --color --sycl-ls-map  --sycl-cfg 0:0 --loglevel 0 --benchmark-mpi
+
+      - name: Try starting Shamrock (installed version)
+        shell: bash # In docker container github action default to sh
+        if: matrix.runtest
+        run: |
+          cd build/install_test/bin
+          ls ..
+          LD_LIBRARY_PATH=../lib:$LD_LIBRARY_PATH ./shamrock --smi --sycl-cfg 0:0

.github/workflows/shamrock-acpp-conda.yml

@@ -64,10 +64,16 @@ jobs:
           cd build
           source ./activate && shamconfigure
 
-      - name: Build
+      - name: Configure sham install
         run: |
           cd build
-          source ./activate && shammake
+          source ./activate &&  \
+            cmake . -DCMAKE_INSTALL_PREFIX=$(pwd)/install_test
+
+      - name: Build & install
+        run: |
+          cd build
+          source ./activate && shammake install
 
       - name: Pull reference files
         run: |
@@ -118,3 +124,10 @@ jobs:
           cd build
           source ./activate
           mpirun --allow-run-as-root --bind-to socket:overload-allowed --oversubscribe -n 4 ./shamrock_test --color --sycl-ls-map  --sycl-cfg 0:0 --loglevel 0 --benchmark-mpi
+
+      - name: Try starting Shamrock (installed version)
+        if: matrix.runtest
+        run: |
+          cd build/install_test/bin
+          ls ..
+          LD_LIBRARY_PATH=../lib:$LD_LIBRARY_PATH ./shamrock --smi --sycl-cfg 0:0

.github/workflows/shamrock-acpp-macos.yml

@@ -65,10 +65,16 @@ jobs:
           cd build
           source ./activate && shamconfigure
 
-      - name: Build
+      - name: Configure sham install
         run: |
           cd build
-          source ./activate && shammake
+          source ./activate &&  \
+            cmake . -DCMAKE_INSTALL_PREFIX=$(pwd)/install_test
+
+      - name: Build & install
+        run: |
+          cd build
+          source ./activate && shammake install
 
       - name: Pull reference files
         run: |
@@ -94,3 +100,10 @@ jobs:
         run: |
           cd build
           mpirun --oversubscribe -n 4 ./shamrock_test --sycl-ls-map  --sycl-cfg 0:0 --loglevel 0 --benchmark-mpi
+
+
+      - name: Try starting Shamrock (installed version)
+        run: |
+          cd build/install_test/bin
+          ls ..
+          LD_LIBRARY_PATH=../lib64:$LD_LIBRARY_PATH ./shamrock --smi --sycl-cfg 0:0

src/CMakeLists.txt

@@ -88,10 +88,15 @@ endif()
 target_include_directories(shamrock PUBLIC "${CMAKE_SOURCE_DIR}/src")
 #target_include_directories(shamrock PUBLIC "${CMAKE_SOURCE_DIR}/external")
 
-#do lib build instead if building the pylib
-
-
-
+# Installing the library
+install(TARGETS shamrock ${as_subproject}
+        EXPORT "shamrock-config"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+        PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+        INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 if("${BUILD_TEST}")
 

src/shamrock/include/shamrock/version.hpp

@@ -55,8 +55,11 @@ inline void print_title_bar() {
 
     logger::raw_ln(
         "\n" + shambase::term_colors::col8b_cyan() + "Shamrock version "
-        + shambase::term_colors::reset() + ": " + version_string);
-    logger::raw_ln(
-        "\n" + shambase::term_colors::col8b_cyan() + "Git infos " + shambase::term_colors::reset()
-        + ":\n" + shambase::trunc_str(git_info_str, 512));
+        + shambase::term_colors::reset() + ": " + version_string + "\n");
+
+    if (is_git) {
+        logger::raw_ln(
+            shambase::term_colors::col8b_cyan() + "Git infos " + shambase::term_colors::reset()
+            + ":\n" + shambase::trunc_str(git_info_str, 512));
+    }
 }