Merge pull request #42 from dbarrow257/Fix_Doubles

Fix double vs float build
dbarrow257 · Oct 15, 2024 · 6a4312c · 6a4312c
2 parents 381d9bb + d72047c
commit 6a4312c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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: |

diff --git a/Constants/OscillatorConstants.h b/Constants/OscillatorConstants.h
@@ -5,7 +5,7 @@
 
 #include <math.h>
 
-#ifdef UseDoubles
+#if UseDoubles==1
 using FLOAT_T = double;
 #else
 using FLOAT_T = float;

diff --git 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