add more targets to flake

Author: ichinii

Scripts/shell.nix

@@ -21,6 +21,9 @@ pkgs.mkShell {
     gdb
     cmake
     ninja
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvcc
+    cudaPackages.cuda_cccl
 
     # rayx-core dependencies
     hdf5
@@ -30,6 +33,7 @@ pkgs.mkShell {
     vulkan-headers
     vulkan-loader
     vulkan-validation-layers
+    vulkan-extension-layer
     vulkan-tools
     vulkan-tools-lunarg
     vulkan-utility-libraries
@@ -52,7 +56,9 @@ pkgs.mkShell {
   ];
 
   shellHook = ''
-    export CMAKE_PREFIX_PATH=${pkgs.boost}:${pkgs.hdf5}:${pkgs.cmake}:${pkgs.pkg-config};
+    export CMAKE_PREFIX_PATH=${pkgs.hdf5}:${pkgs.cmake}:${pkgs.pkg-config}:${pkgs.cudaPackages.cuda_cudart}:${pkgs.vulkan-headers}:${pkgs.vulkan-loader}:${pkgs.vulkan-validation-layers}:${pkgs.vulkan-extension-layer}:${pkgs.vulkan-tools}:${pkgs.vulkan-tools-lunarg}:${pkgs.vulkan-utility-libraries}:${pkgs.cudaPackages.cuda_cccl};
     export VK_LAYER_PATH="${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
+    echo ${pkgs.cudaPackages.cuda_cudart}
+    echo ${pkgs.cudaPackages.cuda_nvcc}
   '';
 }

flake.nix

@@ -78,14 +78,15 @@
             cmake
             gcc14 # pin gcc version for cuda version 12 compatibility
             llvmPackages.openmp
+            cudaPackages.cuda_nvcc
+            cudaPackages.cuda_cccl
             ninja
             patchelf
           ];
 
           buildInputs = with pkgs; [
             hdf5
             cudaPackages.cuda_cudart
-            cudaPackages.cuda_nvcc
           ];
 
           configurePhase = ''
@@ -117,7 +118,7 @@
           installPhase = ''
             mkdir -p $out/bin
             cp -r bin/release/Data $out/bin
-            cp -r bin/release/rayx $out/bin
+            cp -r bin/release/rayx $out/bin/rayx-cuda
 
             mkdir -p $out/lib
             cp -r lib/release/* $out/lib
@@ -170,11 +171,82 @@
           installPhase = ''
             mkdir -p $out
 
+            LOG=$out/rayx-tests-log.txt
             RML=../Intern/rayx-core/tests/input/METRIX_U41_G1_H1_318eV_PS_MLearn_v114.rml
+
             # run rayx with valgrind to catch memory issues
-            valgrind --error-exitcode=42 ./bin/release/rayx -x -V -i $RML |& tee $out/log_rayx.txt
+            echo "\$ valgrind --error-exitcode=42 ./bin/release/rayx -x -V -i $RML" >> $LOG
+            valgrind --error-exitcode=42 ./bin/release/rayx -x -V -i $RML |& tee $LOG
+
+            echo "" >> $LOG
+
             # run tests
-            ./bin/release/rayx-core-tst -x |& tee $out/log_rayx-core-tst.txt
+            echo "\$ ./bin/release/rayx-core-tst -x" >> $LOG
+            echo ./bin/release/rayx-core-tst -x |& tee $LOG
+          '';
+
+          meta.description = "TODO"; # TODO: write description
+        };
+
+        rayx-run-tests-cuda = pkgs.stdenv.mkDerivation {
+          pname = "rayx-run-tests-cuda";
+          version = "1.1.0";
+          inherit src;
+
+          nativeBuildInputs = with pkgs; [
+            cmake
+            gcc
+            llvmPackages.openmp
+            ninja
+            patchelf
+            valgrind
+            cudaPackages.cuda_nvcc
+            cudaPackages.cuda_cccl
+          ];
+
+          buildInputs = with pkgs; [
+            hdf5
+            cudaPackages.cuda_cudart
+          ];
+
+          configurePhase = ''
+            mkdir build
+            cd build
+            cmake -G Ninja .. \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DRAYX_ENABLE_CUDA=ON \
+              -DRAYX_REQUIRE_CUDA=ON \
+              -DRAYX_ENABLE_OPENMP=ON \
+              -DRAYX_REQUIRE_OPENMP=ON \
+              -DRAYX_ENABLE_H5=ON \
+              -DRAYX_REQUIRE_H5=ON \
+              -DRAYX_WERROR=ON \
+              -DRAYX_BUILD_TESTS=ON \
+              -DRAYX_BUILD_RAYX_CLI=ON \
+              -DRAYX_BUILD_RAYX_UI=OFF
+          '';
+
+          buildPhase = ''
+            ninja -v rayx rayx-core-tst
+          '';
+
+          # TODO: provide a better way to access test input file
+          # TODO: testing should not be in the build phase, but rayx-core-tst depends on source directory being preset
+          installPhase = ''
+            mkdir -p $out
+
+            LOG=$out/rayx-tests-cuda-log.txt
+            RML=../Intern/rayx-core/tests/input/METRIX_U41_G1_H1_318eV_PS_MLearn_v114.rml
+
+            # run rayx with valgrind to catch memory issues
+            echo "\$ valgrind --error-exitcode=42 ./bin/release/rayx -X -V -i $RML" >> $LOG
+            valgrind --error-exitcode=42 ./bin/release/rayx -X -V -i $RML |& tee $LOG
+
+            echo "" >> $LOG
+
+            # run tests
+            echo "\$ ./bin/release/rayx-core-tst -X" >> $LOG
+            echo ./bin/release/rayx-core-tst -X |& tee $LOG
           '';
 
           meta.description = "TODO"; # TODO: write description
@@ -197,7 +269,7 @@
 
         rayx-cuda = pkgs.mkShell {
           buildInputs = with pkgs; [
-            self.packages.${system}.rayx
+            self.packages.${system}.rayx-cuda
             hdf5
             cudaPackages.cuda_cudart
           ];
@@ -207,17 +279,16 @@
           '';
         };
 
-        rayx-run-tests = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            self.packages.${system}.rayx-run-tests
-          ];
+        default = rayx;
+      };
 
-          shellHook = ''
-            echo "Inspect the test results in log_rayx.txt and log_rayx-core-tst.txt"
+      apps.${system} = {
+        rayx-tests = {
+          type = "app";
+          program = pkgs.writeShellScript "rayx-tests" ''
+            cat ${self.packages.${system}.rayx-tests}/rayx-tests-log.txt
           '';
         };
-
-        default = rayx;
       };
     };
 }