Merge branch 'PassDebug2Backends' into 'master'

pass build_type=Debug to backends

See merge request laristra/flecsi!78

Author: Irina P. Demeshko

.gitlab-ci.yml

@@ -42,7 +42,7 @@ variables:
   FLECSI_GCC_VERSION: "7.3.0"
   FLECSI_PYTHON_VERSION: "3.5.1"
   FLECSI_ENV_SOURCE_FILE: "${CI_PROJECT_DIR}/flecsi-deps-${FLECSI_MPI_PACKAGE}-${CI_COMMIT_REF_SLUG}-${CI_CONCURRENT_ID}.sh"
-  FLECSI_SPACK_SPEC: "flecsi%gcc@${FLECSI_GCC_VERSION} ~graphviz +hdf5 backend=${RUNTIME} ^${FLECSI_MPI_PACKAGE}"
+  FLECSI_SPACK_SPEC: "flecsi%gcc@${FLECSI_GCC_VERSION} ~graphviz +hdf5 backend=${RUNTIME}"
 before_script:
   - echo ${CI_JOB_NAME_NOSTAGE%.*}-${CI_COMMIT_REF_SLUG}
   - '[ "$(git rev-parse origin/$CI_COMMIT_REF_NAME)" != "$CI_COMMIT_SHA" ] && curl --header "PRIVATE-TOKEN: $MY_CI_API_TOKEN" -X POST https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/cancel'
@@ -61,7 +61,12 @@ before_script:
     spack repo rm laristra_flecsi || /bin/true ;
     spack repo add ${CI_PROJECT_DIR}/spack-repo;
     spack repo list;
-    spack build-env --dump ${FLECSI_ENV_SOURCE_FILE} "${FLECSI_SPACK_SPEC}" || /bin/true;
+    if [[ ${BUILD_TYPE} =~ "Debug" ]];
+    then
+      spack build-env --dump ${FLECSI_ENV_SOURCE_FILE} "${FLECSI_SPACK_SPEC} +debug_backend ^${FLECSI_MPI_PACKAGE}" || /bin/true;
+    else
+      spack build-env --dump ${FLECSI_ENV_SOURCE_FILE} "${FLECSI_SPACK_SPEC} ^${FLECSI_MPI_PACKAGE}" || /bin/true;
+    fi;
     ) 200>${DEPS_LOCK}
   - source ${FLECSI_ENV_SOURCE_FILE} || /bin/true
   - |
@@ -180,8 +185,10 @@ before_script:
       spack repo rm laristra_flecsi || /bin/true ;
       spack repo add ${CI_PROJECT_DIR}/spack-repo;
       spack repo list;
-      spack install -v --only dependencies ${FLECSI_SPACK_SPEC}openmpi%gcc@${FLECSI_GCC_VERSION};
-      spack install -v --only dependencies ${FLECSI_SPACK_SPEC}mpich%gcc@${FLECSI_GCC_VERSION};
+      spack install -v --only dependencies ${FLECSI_SPACK_SPEC} ^openmpi%gcc@${FLECSI_GCC_VERSION};
+      spack install -v --only dependencies ${FLECSI_SPACK_SPEC} ^mpich%gcc@${FLECSI_GCC_VERSION};
+      spack install -v --only dependencies ${FLECSI_SPACK_SPEC} +debug_backend ^openmpi%gcc@${FLECSI_GCC_VERSION};
+      spack install -v --only dependencies ${FLECSI_SPACK_SPEC} +debug_backend ^mpich%gcc@${FLECSI_GCC_VERSION};
       ) 200>${DEPS_LOCK}
 
 ###############

spack-repo/packages/flecsi/package.py

@@ -26,6 +26,8 @@ class Flecsi(CMakePackage):
             description='The build type to build', multi=False)
     variant('backend', default='mpi', values=('serial', 'mpi', 'legion', 'hpx'),
             description='Backend to use for distributed memory', multi=False)
+    variant('debug_backend', default=False,
+            description='Build Backend with Debug Mode')
     variant('minimal', default=False,
             description='Disable FindPackageMetis')
     variant('shared', default=True,
@@ -55,8 +57,11 @@ class Flecsi(CMakePackage):
     depends_on('mpi', when='backend=mpi')
     depends_on('mpi', when='backend=legion')
     depends_on('mpi', when='backend=hpx')
+    depends_on('legion@ctrl-rep +shared +mpi build_type=Debug +hdf5', when='backend=legion +debug_backend +hdf5')
+    depends_on('legion@ctrl-rep +shared +mpi build_type=Debug', when='backend=legion +debug_backend ~hdf5')
     depends_on('legion@ctrl-rep +shared +mpi +hdf5', when='backend=legion +hdf5')
     depends_on('legion@ctrl-rep +shared +mpi', when='backend=legion ~hdf5')
+    depends_on('hpx@1.3.0 cxxstd=14 build_type=Debug', when='backend=hpx +debug_backend')
     depends_on('hpx@1.3.0 cxxstd=14', when='backend=hpx')
     depends_on('boost@1.70.0: cxxstd=14 +program_options')
     depends_on('metis@5.1.0:')

spack-repo/packages/legion/package.py

@@ -69,7 +69,9 @@ def cmake_args(self):
             '-DBUILD_SHARED_LIBS=%s' % ('+shared' in self.spec)]
 
         if self.spec.variants['build_type'].value == 'Debug':
-            cmake_cxx_flags.append('-DDEBUG_REALM', '-DDEBUG_LEGION', '-ggdb')
+            cmake_cxx_flags.append('-DDEBUG_REALM')
+            cmake_cxx_flags.append('-DDEBUG_LEGION')
+            cmake_cxx_flags.append('-ggdb')
 
         options.append('-DCMAKE_CXX_FLAGS=%s' % (" ".join(cmake_cxx_flags)))