From 155061ad7718dc3c786abc2b0a719b4cfc8b6028 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Sun, 19 Apr 2020 14:48:13 +0200
Subject: [PATCH] also update clang7 to clang8
---
.gitlab-ci.yml | 4 ++--
hysop/backend/device/opencl/opencl_env.py | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ca7d1a23..923fb7fb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ config:bionic:
stage: configure
script:
- "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-7 $CI_PROJECT_DIR/install/gcc-7 gcc-7 g++-7 gfortran-7"
- - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-7 $CI_PROJECT_DIR/install/clang-7 clang-7 clang++-7 gfortran-7"
+ - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-8 $CI_PROJECT_DIR/install/clang-8 clang-8 clang++-8 gfortran-7"
dependencies:
- env:bionic
artifacts:
@@ -30,7 +30,7 @@ build:bionic:
stage: build
script:
- "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-7 gcc-7 g++-7 gfortran-7"
- - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-7 clang-7 clang++-7 gfortran-7"
+ - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-8 clang-8 clang++-8 gfortran-7"
dependencies:
- config:bionic
artifacts:
diff --git a/hysop/backend/device/opencl/opencl_env.py b/hysop/backend/device/opencl/opencl_env.py
index f85f5a7e9..ed84e0f68 100644
--- a/hysop/backend/device/opencl/opencl_env.py
+++ b/hysop/backend/device/opencl/opencl_env.py
@@ -566,14 +566,13 @@ Dumped OpenCL Kernel '{}'
if not os.path.exists(dump_folder) and (main_rank == 0):
os.makedirs(dump_folder)
- if DEBUG and True:
+ if DEBUG:
# dump kernel source while in debug mode
dump_file=dump_folder+'/rk{}_{}_dump.cl'.format(
main_rank, kernel_name)
print 'Dumping kernel src at \'{}\'.'.format(dump_file)
with open(dump_file, 'w+') as f:
f.write(gpu_src)
- build_opts += ['-g', '-s {}'.format(dump_file)]
s_build_opts = ' '.join(build_opts)
if VERBOSE:
--
GitLab