Fix CI

.gitlab-ci.yml

@@ -100,7 +100,7 @@ build_openmp:
       - build
       - chameleon_openmp.log
   variables:
-    BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON"
+    BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
     VERSION: openmp
 
 test_starpu_branches:

CMakeLists.txt

@@ -169,7 +169,7 @@ elseif(CHAMELEON_SCHED_OPENMP)
             "   To use CHAMELEON with StarPU runtime: set CHAMELEON_SCHED_STARPU to ON\n"
             "   To use CHAMELEON with Quark  runtime: set CHAMELEON_SCHED_QUARK  to ON\n"
             "   To use CHAMELEON with PaRSEC runtime: set CHAMELEON_SCHED_PARSEC to ON\n"
-            "   (CHAMELEON_SCHED_PARSEC will be disabled)${ColourReset}")
+            "   (CHAMELEON_SCHED_OPENMP will be disabled)${ColourReset}")
 endif()
 
 # Check that one, and only one, SCHED option is set to ON
@@ -932,20 +932,14 @@ if( CHAMELEON_SCHED_QUARK )
 endif()
 
 if( CHAMELEON_SCHED_OPENMP )
-
-    # create list of components in order to make a single call to find_package(starpu...)
-    set(OPENMP_COMPONENT_LIST "HWLOC")
-    if(CHAMELEON_USE_CUDA)
-        list(APPEND OPENMP_COMPONENT_LIST "CUDA")
-    endif()
-
-    find_package(OpenMP COMPONENTS ${OPENMP_COMPONENT_LIST})
+    find_package(OpenMP REQUIRED)
 
     if ( OPENMP_FOUND )
         message("-- ${Blue}Add definition CHAMELEON_SCHED_OPENMP"
         " - Activate OpenMP in Chameleon${ColourReset}")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
         # TODO: check for compiler support for "_Pragma"
     else ( OPENMP_FOUND )
       message(FATAL_ERROR "Something went wrong when finding OpenMP")

runtime/openmp/CMakeLists.txt

@@ -85,6 +85,7 @@ precisions_rules_py(RUNTIME_SRCS_GENERATED "${ZSRC}"
 set(RUNTIME_SRCS
   ${RUNTIME_COMMON}
   ${RUNTIME_SRCS_GENERATED}
+  ${CODELETS_SRC}
   )
 
 # Force generation of sources

runtime/openmp/codelets/codelet_map.c

+/**
+ *
+ * @file quark/codelet_map.c
+ *
+ * @copyright 2018-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ *                      Univ. Bordeaux. All rights reserved.
+ *
+ ***
+ *
+ * @brief Chameleon map Quark codelet
+ *
+ * @version 1.0.0
+ * @author Mathieu Faverge
+ * @date 2018-09-24
+ *
+ */
+#include "chameleon_openmp.h"
+
+void INSERT_TASK_map( const RUNTIME_option_t *options,
+                      cham_uplo_t uplo, const CHAM_desc_t *A, int Am, int An,
+                      cham_unary_operator_t operator, void *op_args )
+{
+    char *ptrA = RTBLKADDR( A, char, Am, An );
+
+#pragma omp task depend(inout: ptrA[0])
+    {
+        operator( A, uplo, Am, An, ptrA, op_args );
+    }
+
+}