From 382390d733847c765f3fc68d8a0edc1f57c22d2a Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:26:27 +0100 Subject: [PATCH 1/3] Fix double vs float build --- Constants/OscillatorConstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Constants/OscillatorConstants.h b/Constants/OscillatorConstants.h index d047916..34f686b 100644 --- a/Constants/OscillatorConstants.h +++ b/Constants/OscillatorConstants.h @@ -5,7 +5,7 @@ #include -#ifdef UseDoubles +#if UseDoubles==1 using FLOAT_T = double; #else using FLOAT_T = float; From aee6580085465e453a54d1d78192e05c2d28515f Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:29:44 +0100 Subject: [PATCH 2/3] Update CIValidations.yml --- .github/workflows/CIValidations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CIValidations.yml b/.github/workflows/CIValidations.yml index 9147da3..b6a2d78 100755 --- a/.github/workflows/CIValidations.yml +++ b/.github/workflows/CIValidations.yml @@ -37,7 +37,7 @@ jobs: git checkout ${{ github.head_ref }} mkdir build cd build - cmake ../ -DUseGPU=0 -DUseMultithreading=1 -DUseDoubles=0 -DUseCUDAProb3=0 -DUseCUDAProb3Linear=1 -DUseProb3ppLinear=1 -DUseNuFASTLinear=1 -DUseProbGPULinear=0 + cmake ../ -DUseGPU=0 -DUseMultithreading=1 -DUseDoubles=1 -DUseCUDAProb3=0 -DUseCUDAProb3Linear=1 -DUseProb3ppLinear=1 -DUseNuFASTLinear=1 -DUseProbGPULinear=0 - name: Build NuOscillator run: | From d72047c0403ba5af620dffa04a8e087a6172a554 Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:30:08 +0100 Subject: [PATCH 3/3] Update Dockerfile --- Docs/DockerFiles/Alma9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/DockerFiles/Alma9/Dockerfile b/Docs/DockerFiles/Alma9/Dockerfile index 5556d34..ea8b5c1 100755 --- a/Docs/DockerFiles/Alma9/Dockerfile +++ b/Docs/DockerFiles/Alma9/Dockerfile @@ -24,7 +24,7 @@ RUN git checkout ${NUOSCILLATOR_VERSION} RUN mkdir -p ${NuOscillator_INSTALL_DIR} WORKDIR ${NuOscillator_INSTALL_DIR} -RUN cmake -DUseGPU=0 -DUseMultithreading=1 -DUseDoubles=0 -DUseCUDAProb3=0 -DUseCUDAProb3Linear=1 -DUseProb3ppLinear=1 -DUseNuFASTLinear=1 -DUseProbGPULinear=0 ${NuOscillator_WORK_DIR} +RUN cmake -DUseGPU=0 -DUseMultithreading=1 -DUseDoubles=1 -DUseCUDAProb3=0 -DUseCUDAProb3Linear=1 -DUseProb3ppLinear=1 -DUseNuFASTLinear=1 -DUseProbGPULinear=0 ${NuOscillator_WORK_DIR} RUN make VERBOSE=1 && make install # KS: Need to set them here, otherwise container using this container will not be able to find NuOscillator