From 6b897cb1d992194813d597a5ecb8cc0d8c56528c Mon Sep 17 00:00:00 2001 From: Philippe Virouleau <philippe.44@gmail.com> Date: Wed, 5 Dec 2018 14:45:26 +0100 Subject: [PATCH] Reviews --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca71fb23b..ba98290c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ build_openmp: - build - chameleon_openmp.log variables: - BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++" + BUILD_OPTIONS: "-DCHAMELEON_SCHED_OPENMP=ON" VERSION: openmp test_starpu_branches: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b0d295a1..b9ddfa195 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ if ( CHAMELEON_SCHED_PARSEC OR CHAMELEON_SCHED_STARPU ) set(CHAMELEON_ENABLE_MPI ON FORCE) endif() -# FIXME: with OpenMP-target we should enable CUDA too # Use intermediate variable since cmake_dependent_option doesn't have OR conditions set(CHAMELEON_ENABLE_CUDA OFF CACHE INTERNAL "Tells if CUDA might be supported by the runtime") if ( CHAMELEON_SCHED_PARSEC OR CHAMELEON_SCHED_STARPU ) -- GitLab