From fb586dab8376e243874e99da44e0a4df39957562 Mon Sep 17 00:00:00 2001 From: Marc Modat Date: Mon, 24 Jul 2023 10:46:04 +0100 Subject: [PATCH] #92: Set the test seed to constant for reproducibility --- niftyreg_build_version.txt | 2 +- reg-lib/cuda/blockMatchingKernel.cu | 6 ++++++ reg-test/reg_test_blockMatching.cpp | 3 +-- reg-test/reg_test_conjugateGradient.cpp | 3 +-- reg-test/reg_test_getDeformationField.cpp | 3 +-- reg-test/reg_test_lncc.cpp | 3 +-- reg-test/reg_test_normaliseGradient.cpp | 3 +-- reg-test/reg_test_regr_blockMatching.cpp | 4 +--- reg-test/reg_test_regr_lts.cpp | 3 +-- reg-test/reg_test_regr_nmi.cpp | 3 +-- reg-test/reg_test_voxelCentricToNodeCentric.cpp | 3 +-- 11 files changed, 16 insertions(+), 20 deletions(-) diff --git a/niftyreg_build_version.txt b/niftyreg_build_version.txt index 6cf44528..209ac45b 100644 --- a/niftyreg_build_version.txt +++ b/niftyreg_build_version.txt @@ -1 +1 @@ -285 +287 diff --git a/reg-lib/cuda/blockMatchingKernel.cu b/reg-lib/cuda/blockMatchingKernel.cu index 874a20de..cd91c556 100644 --- a/reg-lib/cuda/blockMatchingKernel.cu +++ b/reg-lib/cuda/blockMatchingKernel.cu @@ -90,6 +90,12 @@ __device__ __inline__ float blockReduceSum(float val, unsigned tid) { shared[tid] += shared[tid + i]; __syncthreads(); } + // if (tid == 0){ + // for (unsigned i = 1; i < 64; ++i) { + // shared[0] += shared[i]; + // } + // } + // __syncthreads(); return shared[0]; } /* *************************************************************** */ diff --git a/reg-test/reg_test_blockMatching.cpp b/reg-test/reg_test_blockMatching.cpp index f237a44d..06ce0faf 100644 --- a/reg-test/reg_test_blockMatching.cpp +++ b/reg-test/reg_test_blockMatching.cpp @@ -24,8 +24,7 @@ class BMTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create 2D and 3D reference images diff --git a/reg-test/reg_test_conjugateGradient.cpp b/reg-test/reg_test_conjugateGradient.cpp index d4b060f6..39e3195e 100644 --- a/reg-test/reg_test_conjugateGradient.cpp +++ b/reg-test/reg_test_conjugateGradient.cpp @@ -25,8 +25,7 @@ class ConjugateGradientTest: public InterfaceOptimiser { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a reference 2D image diff --git a/reg-test/reg_test_getDeformationField.cpp b/reg-test/reg_test_getDeformationField.cpp index 03b17dd7..f9e15c86 100644 --- a/reg-test/reg_test_getDeformationField.cpp +++ b/reg-test/reg_test_getDeformationField.cpp @@ -25,8 +25,7 @@ class GetDeformationFieldTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a 2D reference image diff --git a/reg-test/reg_test_lncc.cpp b/reg-test/reg_test_lncc.cpp index a6f1052b..4f0118c4 100644 --- a/reg-test/reg_test_lncc.cpp +++ b/reg-test/reg_test_lncc.cpp @@ -18,8 +18,7 @@ class LNCCTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create reference and floating 2D images diff --git a/reg-test/reg_test_normaliseGradient.cpp b/reg-test/reg_test_normaliseGradient.cpp index 47876b7c..6b388e90 100644 --- a/reg-test/reg_test_normaliseGradient.cpp +++ b/reg-test/reg_test_normaliseGradient.cpp @@ -25,8 +25,7 @@ class NormaliseGradientTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a reference 2D image diff --git a/reg-test/reg_test_regr_blockMatching.cpp b/reg-test/reg_test_regr_blockMatching.cpp index be362a51..55b824b0 100644 --- a/reg-test/reg_test_regr_blockMatching.cpp +++ b/reg-test/reg_test_regr_blockMatching.cpp @@ -19,9 +19,7 @@ class BMTest { if (!testCases.empty()) return; - // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a reference and floating 2D images diff --git a/reg-test/reg_test_regr_lts.cpp b/reg-test/reg_test_regr_lts.cpp index c7c72ef1..5a075ae8 100644 --- a/reg-test/reg_test_regr_lts.cpp +++ b/reg-test/reg_test_regr_lts.cpp @@ -23,8 +23,7 @@ class LTSTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a reference and floating 2D images diff --git a/reg-test/reg_test_regr_nmi.cpp b/reg-test/reg_test_regr_nmi.cpp index 842a46e3..c79f9e5b 100644 --- a/reg-test/reg_test_regr_nmi.cpp +++ b/reg-test/reg_test_regr_nmi.cpp @@ -21,8 +21,7 @@ class NmiTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create 2D reference, floating and control point grid images diff --git a/reg-test/reg_test_voxelCentricToNodeCentric.cpp b/reg-test/reg_test_voxelCentricToNodeCentric.cpp index 027e5467..da95af28 100644 --- a/reg-test/reg_test_voxelCentricToNodeCentric.cpp +++ b/reg-test/reg_test_voxelCentricToNodeCentric.cpp @@ -23,8 +23,7 @@ class VoxelCentricToNodeCentricTest { return; // Create a random number generator - std::random_device rd; - std::mt19937 gen(rd()); + std::mt19937 gen(0); std::uniform_real_distribution distr(0, 1); // Create a 2D reference image