Merge pull request #89 from PurplePachyderm/TREX-CoE-master

Change vfc_ci wrapper library and config

configure.ac

@@ -273,7 +273,6 @@ AC_ARG_ENABLE([hpc],
 AS_IF([test "x$enable_hpc" = "yes"],
       [AC_DEFINE([HAVE_HPC], [1], [Activate HPC routines])])
 
-echo "XXX VFC"
 # Enable Verificarlo tests
 AC_ARG_ENABLE([vfc_ci],
               [AS_HELP_STRING([--enable-vfc_ci],
@@ -281,11 +280,10 @@ AC_ARG_ENABLE([vfc_ci],
               [enable_vfc_ci=$enableval],
               [enable_vfc_ci=no])
 
-vfc_ci="false"
-AS_IF([test "x$enable_vfc_ci" = "yes"],
-       [vfc_ci="true"
-        FCFLAGS="-D VFC_CI $FCFLAGS"
-	CFLAGS="-D VFC_CI $CFLAGS"])
+AS_IF([test "x$enable_vfc_ci" = "xyes"],
+       [FCFLAGS="-D VFC_CI $FCFLAGS"
+	CFLAGS="-D VFC_CI $CFLAGS"
+        LDFLAGS="-lvfc_probes $LDFLAGS"])
 
 AM_CONDITIONAL([VFC_CI], [test "x$vfc_ci" = "xtrue"])
 

org/qmckl_distance.org

@@ -20,6 +20,9 @@ int main() {
   qmckl_context context;
   context = qmckl_context_create();
 
+#ifdef VFC_CI
+  qmckl_init_probes();
+#endif
 
   #+end_src
 
@@ -1517,6 +1520,9 @@ end function qmckl_distance_rescaled_deriv_e_f
 
   assert (qmckl_context_destroy(context) == QMCKL_SUCCESS);
 
+#ifdef VFC_CI
+  qmckl_dump_probes();
+#endif
   return 0;
 }
 

org/qmckl_verificarlo.org

@@ -76,17 +76,15 @@ https://github.com/verificarlo/verificarlo/blob/master/doc/06-Postprocessing.md#
 ** Automatically initialize the ~vfc_probe~ object if ~VFC_CI~ is defined
 
   #+begin_src c :tangle (eval h_private_func)
-#ifdef VFC_CI
-void qmckl_init_probes() __attribute__((constructor));
-#endif
+void qmckl_init_probes();
   #+end_src
 
   #+begin_src c :tangle (eval c)
+void qmckl_init_probes(){
 #ifdef VFC_CI
-void __attribute__((constructor)) qmckl_init_probes(){
 	probes = vfc_init_probes();
-}
 #endif
+}
   #+end_src
 
 ** Standard probe, without check
@@ -183,17 +181,15 @@ bool qmckl_probe_check_relative (
 ** Automatically delete and dump the vfc_probe object if ~VFC_CI~ is defined
 
   #+begin_src c :tangle (eval h_private_func)
-#ifdef VFC_CI
-void qmckl_dump_probes() __attribute__((destructor));
-#endif
+void qmckl_dump_probes();
   #+end_src
 
   #+begin_src c :tangle (eval c)
+void qmckl_dump_probes(){
 #ifdef VFC_CI
-void __attribute__((destructor)) qmckl_dump_probes(){
     vfc_dump_probes(&probes);
-}
 #endif
+}
   #+end_src
 
 * Fortran wrappers

vfc_tests_config.json

@@ -7,13 +7,6 @@
                 "name": "libinterflop_mca.so",
                 "repetitions": 25
             }]
-        },
-        {
-            "executable": "tests/test_qmckl_ao",
-            "vfc_backends": [{
-                "name": "libinterflop_mca.so",
-                "repetitions": 25
-            }]
         }
     ]
 }