Merge pull request #1274 from LSSTDESC/revertCMakeChange

test full compilation in CI

Author: carlosggarcia

.github/workflows/ci.yml

@@ -93,6 +93,12 @@ jobs:
       - name: Install CCL
         run: pip install -v -e .
 
+      - name: Full compilation (to run C-level benchmarks)
+        run: |
+          cmake -H. -Bbuild -DPYTHON_VERSION=0.0.0
+          make -Cbuild all
+          ./build/check_ccl
+
       - name: Unit tests
         run: |
           OMP_NUM_THREADS=2 pytest -vv pyccl --cov=pyccl --cov-report=lcov:lcov.info

CMakeLists.txt

@@ -104,6 +104,12 @@ target_link_libraries(ccl ${GSL_LIBRARIES} ${FFTW_LIBRARIES} ${CLASS_LIBRARIES}
 
 # Builds the test suite
 add_executable(check_ccl ${TEST_SRC})
+if(APPLE)
+  # Prevent per-function/section splitting for the test target so the .ctest entries are kept
+  target_compile_options(check_ccl PRIVATE -fno-function-sections)
+else()
+  target_link_options(check_ccl PRIVATE "-Wl,--no-gc-sections")
+endif()
 target_link_libraries(check_ccl ccl)
 
 # Builds pkgconfig file for CCL

benchmarks/ccl_test_f2d.c

@@ -287,10 +287,14 @@ CTEST2(f2d,pk) {
   ccl_configuration config = default_config;
   config.transfer_function_method = ccl_bbks;
   config.matter_power_spectrum_method = ccl_linear;
-  ccl_parameters params = ccl_parameters_create(data->Omega_c,data->Omega_b, 0.0, 3.046, &mnu,
-                                                0, -1.0, 0.0, data->h, data->A_s,data->n_s,
-                                                -1, -1, -1, 0., 0., 1.0, 1.0, 0.0,
-						-1, NULL, NULL, &status);
+  ccl_parameters params = ccl_parameters_create(data->Omega_c, data->Omega_b, 0.0,
+                                                3.046, &mnu, 0,
+                                                -1.0, 0.0, data->h, data->A_s, -1,
+                                                data->n_s, -1, 0.0, 0.0,
+                                                -1, -1, -1,
+                                                0.0, 0.0,
+                                                1.0, 1.0, 0.0,
+                                                -1, NULL, NULL, &status);
   params.T_CMB=2.7;
   params.Omega_k=0;
   params.Omega_g=0;

benchmarks/ccl_test_f3d.c

@@ -5,6 +5,8 @@
 #include <math.h>
 #include <string.h>
 
+// Defining 1e-4 tolerance as in the old version of ctest.h vs 1e-12 in the new one
+#define DBL_NEAR_TOL 1e-4
 
 double a_func(double a)
 {
@@ -115,7 +117,7 @@ CTEST2(f3d,baseline) {
 
   tkka=ccl_f3d_t_eval(tsp,lktest,lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in a
   tkka=ccl_f3d_t_eval(tsp,lktest,lktest,0.01,finda,NULL,&status);
@@ -126,33 +128,33 @@ CTEST2(f3d,baseline) {
   double klow=1E-5;
   tkka=ccl_f3d_t_eval(tsp,log(klow),lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(klow,exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(klow,exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (low, #2)
   tkka=ccl_f3d_t_eval(tsp,lktest, log(klow),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),klow,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),klow,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (low, #1 and #2)
   tkka=ccl_f3d_t_eval(tsp,log(klow), log(klow),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(klow,klow,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(klow,klow,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #1)
   double khigh=1E3;
   tkka=ccl_f3d_t_eval(tsp,log(khigh),lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(khigh,exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(khigh,exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #2)
   tkka=ccl_f3d_t_eval(tsp,lktest, log(khigh),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),khigh,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),khigh,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #1 and #2)
   tkka=ccl_f3d_t_eval(tsp,log(khigh), log(khigh),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(khigh,khigh,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(khigh,khigh,atest), DBL_NEAR_TOL);
 
   ccl_a_finder_free(finda);
   ccl_f3d_t_free(tsp);
@@ -179,7 +181,7 @@ CTEST2(f3d,factorized) {
 
   tkka=ccl_f3d_t_eval(tsp,lktest,lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in a
   tkka=ccl_f3d_t_eval(tsp,lktest,lktest,0.01,finda,NULL,&status);
@@ -190,33 +192,33 @@ CTEST2(f3d,factorized) {
   double klow=1E-5;
   tkka=ccl_f3d_t_eval(tsp,log(klow),lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(klow,exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(klow,exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (low, #2)
   tkka=ccl_f3d_t_eval(tsp,lktest, log(klow),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),klow,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),klow,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (low, #1 and #2)
   tkka=ccl_f3d_t_eval(tsp,log(klow), log(klow),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(klow,klow,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(klow,klow,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #1)
   double khigh=1E3;
   tkka=ccl_f3d_t_eval(tsp,log(khigh),lktest,atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(khigh,exp(lktest),atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(khigh,exp(lktest),atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #2)
   tkka=ccl_f3d_t_eval(tsp,lktest, log(khigh),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(exp(lktest),khigh,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(exp(lktest),khigh,atest), DBL_NEAR_TOL);
 
   //Extrapolation in k (high, #1 and #2)
   tkka=ccl_f3d_t_eval(tsp,log(khigh), log(khigh),atest,finda,NULL,&status);
   ASSERT_TRUE(status==0);
-  ASSERT_DBL_NEAR(1,tkka/tkka_model(khigh,khigh,atest));
+  ASSERT_DBL_NEAR_TOL(1,tkka/tkka_model(khigh,khigh,atest), DBL_NEAR_TOL);
 
   ccl_a_finder_free(finda);
   ccl_f3d_t_free(tsp);