From 4faf6171e3f28ce1556dd8e139cfe7bff187bccc Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Tue, 31 Dec 2019 09:53:05 +0000 Subject: [PATCH 1/5] adding easyconfigs: pocl-1.4-GCC-8.3.0.eb, pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb and patches: pocl-1.4_remove-c11-std.patch --- .../pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb | 45 +++++++++++++++++++ .../easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb | 41 +++++++++++++++++ .../p/pocl/pocl-1.4_remove-c11-std.patch | 36 +++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb create mode 100644 easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb create mode 100644 easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb new file mode 100644 index 00000000000..a245efcdc98 --- /dev/null +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb @@ -0,0 +1,45 @@ +easyblock = 'CMakeMake' + +name = 'pocl' +version = '1.4' + +local_cudaver = '10.1.243' +versionsuffix = '-CUDA-%s' % (local_cudaver) + +homepage = 'http://portablecl.org' +description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" + +toolchain = {'name': 'GCC', 'version': '8.3.0'} + +source_urls = ['https://github.com/pocl/pocl/archive/'] +sources = ['v%(version)s.tar.gz'] +patches = ['%(name)s-%(version)s_remove-c11-std.patch'] +checksums = [ + 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz + '15d81b142d836e188061c67af9df6e60381e40db92bd433fb6677033fb6c5a23', # pocl-1.4_remove-c11-std.patch +] + +builddependencies = [ + ('CMake', '3.15.3'), + ('pkg-config', '0.29.2'), +] + +dependencies = [ + ('Clang', '9.0.1', versionsuffix), + ('CUDA', local_cudaver, '', True), + ('hwloc', '1.11.12'), + ('libtool', '2.4.6'), + ('libxml2', '2.9.9'), +] + +separate_build_dir = True + +# disable attempt to find an ICD loader, always build libOpenCL.so, enable CUDA +configopts = "-DENABLE_ICD=0 -DINSTALL_OPENCL_HEADERS=1 -DENABLE_CUDA=1" + +sanity_check_paths = { + 'files': ['bin/poclcc', 'lib64/libOpenCL.%s' % SHLIB_EXT], + 'dirs': ['include/CL', 'lib64/pkgconfig'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb new file mode 100644 index 00000000000..9d67b946980 --- /dev/null +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb @@ -0,0 +1,41 @@ +easyblock = 'CMakeMake' + +name = 'pocl' +version = '1.4' + +homepage = 'http://portablecl.org' +description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" + +toolchain = {'name': 'GCC', 'version': '8.3.0'} + +source_urls = ['https://github.com/pocl/pocl/archive/'] +sources = ['v%(version)s.tar.gz'] +patches = ['%(name)s-%(version)s_remove-c11-std.patch'] +checksums = [ + 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz + '15d81b142d836e188061c67af9df6e60381e40db92bd433fb6677033fb6c5a23', # pocl-1.4_remove-c11-std.patch +] + +builddependencies = [ + ('CMake', '3.15.3'), + ('pkg-config', '0.29.2'), +] + +dependencies = [ + ('Clang', '9.0.1'), + ('hwloc', '1.11.12'), + ('libtool', '2.4.6'), + ('libxml2', '2.9.9'), +] + +separate_build_dir = True + +# disable attempt to find an ICD loader, always build libOpenCL.so +configopts = "-DENABLE_ICD=0 -DINSTALL_OPENCL_HEADERS=1" + +sanity_check_paths = { + 'files': ['bin/poclcc', 'lib64/libOpenCL.%s' % SHLIB_EXT], + 'dirs': ['include/CL', 'lib64/pkgconfig'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch b/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch new file mode 100644 index 00000000000..c5adc164bf4 --- /dev/null +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch @@ -0,0 +1,36 @@ +c++11 std causes the build to fail on ppc64le, so stop it being set in various CMake files +Patch by Simon Branford, University of Birmingham +--- cmake/LLVM.cmake.orig 2019-12-30 18:43:07.077199000 +0000 ++++ cmake/LLVM.cmake 2019-12-30 18:44:37.953255342 +0000 +@@ -96,6 +96,7 @@ + string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CFLAGS "${LLVM_CFLAGS}") + run_llvm_config(LLVM_CXXFLAGS --cxxflags) + string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") ++string(REPLACE "-std=c++11" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") + run_llvm_config(LLVM_CPPFLAGS --cppflags) + string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CPPFLAGS "${LLVM_CPPFLAGS}") + run_llvm_config(LLVM_LDFLAGS --ldflags) +--- CMakeLists.txt.orig 2019-12-30 18:53:08.443068000 +0000 ++++ CMakeLists.txt 2019-12-30 18:54:27.201578300 +0000 +@@ -634,8 +634,8 @@ + # down the kernels, so it needs to be determined whether it's worth + # the trouble. + set(DEFAULT_KERNEL_CL_FLAGS "-xcl -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") +-set(DEFAULT_KERNEL_C_FLAGS "-xc -std=c11 -D__CBUILD__ -fno-math-errno -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") +-set(DEFAULT_KERNEL_CXX_FLAGS "-xc++ -std=c++11 -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") ++set(DEFAULT_KERNEL_C_FLAGS "-xc -D__CBUILD__ -fno-math-errno -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") ++set(DEFAULT_KERNEL_CXX_FLAGS "-xc++ -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") + + set(EXTRA_KERNEL_FLAGS "" CACHE STRING "Extra arguments to all kernel compilation commands (defaults to empty)") + set(EXTRA_KERNEL_CL_FLAGS "" CACHE STRING "Extra arguments to kernel CL compiler (defaults to empty)") +--- tests/regression/CMakeLists.txt.orig 2019-12-30 19:15:16.490362000 +0000 ++++ tests/regression/CMakeLists.txt 2019-12-30 19:15:30.527613525 +0000 +@@ -53,7 +53,7 @@ + if (MSVC) + add_compile_options(${OPENCL_CFLAGS}) + else () +- add_compile_options("-std=c++11" "-Wno-deprecated" "-Wno-deprecated-declarations" ${OPENCL_CFLAGS}) ++ add_compile_options("-Wno-deprecated" "-Wno-deprecated-declarations" ${OPENCL_CFLAGS}) + endif () + + add_definitions("-DSRCDIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"") From 84fc40311f0a7ced393437b819d3de38b5c3373a Mon Sep 17 00:00:00 2001 From: Simon Branford <4967+branfosj@users.noreply.github.com> Date: Tue, 31 Dec 2019 11:46:01 +0000 Subject: [PATCH 2/5] move the CUDA version to gcccuda toolchain --- ...C-8.3.0-CUDA-10.1.243.eb => pocl-1.4-gcccuda-2019b.eb} | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) rename easybuild/easyconfigs/p/pocl/{pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb => pocl-1.4-gcccuda-2019b.eb} (84%) diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb similarity index 84% rename from easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb rename to easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb index a245efcdc98..1a066160fed 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0-CUDA-10.1.243.eb +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb @@ -3,13 +3,10 @@ easyblock = 'CMakeMake' name = 'pocl' version = '1.4' -local_cudaver = '10.1.243' -versionsuffix = '-CUDA-%s' % (local_cudaver) - homepage = 'http://portablecl.org' description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" -toolchain = {'name': 'GCC', 'version': '8.3.0'} +toolchain = {'name': 'gcccuda', 'version': '2019b'} source_urls = ['https://github.com/pocl/pocl/archive/'] sources = ['v%(version)s.tar.gz'] @@ -25,8 +22,7 @@ builddependencies = [ ] dependencies = [ - ('Clang', '9.0.1', versionsuffix), - ('CUDA', local_cudaver, '', True), + ('Clang', '9.0.1', '-CUDA-10.1.243'), ('hwloc', '1.11.12'), ('libtool', '2.4.6'), ('libxml2', '2.9.9'), From d3f20f575b3c3cf0c839bf249b73ff781c9f1a86 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Thu, 2 Jan 2020 14:59:04 +0000 Subject: [PATCH 3/5] set gnu++11 in toolchainopts which simplifies the patch --- easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb | 3 ++- .../easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb | 3 ++- .../p/pocl/pocl-1.4_remove-c11-std.patch | 13 ------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb index 9d67b946980..d2e92d335d5 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb @@ -7,13 +7,14 @@ homepage = 'http://portablecl.org' description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" toolchain = {'name': 'GCC', 'version': '8.3.0'} +toolchainopts = {'cstd': 'gnu++11'} source_urls = ['https://github.com/pocl/pocl/archive/'] sources = ['v%(version)s.tar.gz'] patches = ['%(name)s-%(version)s_remove-c11-std.patch'] checksums = [ 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz - '15d81b142d836e188061c67af9df6e60381e40db92bd433fb6677033fb6c5a23', # pocl-1.4_remove-c11-std.patch + 'd3b34f64b9142a857aa601c13220159b8fa21a51e93d8aaacd8d949588fd9af1', # pocl-1.4_remove-c11-std.patch ] builddependencies = [ diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb index 1a066160fed..1ddebc3094d 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb @@ -7,13 +7,14 @@ homepage = 'http://portablecl.org' description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" toolchain = {'name': 'gcccuda', 'version': '2019b'} +toolchainopts = {'cstd': 'gnu++11'} source_urls = ['https://github.com/pocl/pocl/archive/'] sources = ['v%(version)s.tar.gz'] patches = ['%(name)s-%(version)s_remove-c11-std.patch'] checksums = [ 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz - '15d81b142d836e188061c67af9df6e60381e40db92bd433fb6677033fb6c5a23', # pocl-1.4_remove-c11-std.patch + 'd3b34f64b9142a857aa601c13220159b8fa21a51e93d8aaacd8d949588fd9af1', # pocl-1.4_remove-c11-std.patch ] builddependencies = [ diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch b/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch index c5adc164bf4..c9f225cdb4a 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch @@ -10,19 +10,6 @@ Patch by Simon Branford, University of Birmingham run_llvm_config(LLVM_CPPFLAGS --cppflags) string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CPPFLAGS "${LLVM_CPPFLAGS}") run_llvm_config(LLVM_LDFLAGS --ldflags) ---- CMakeLists.txt.orig 2019-12-30 18:53:08.443068000 +0000 -+++ CMakeLists.txt 2019-12-30 18:54:27.201578300 +0000 -@@ -634,8 +634,8 @@ - # down the kernels, so it needs to be determined whether it's worth - # the trouble. - set(DEFAULT_KERNEL_CL_FLAGS "-xcl -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") --set(DEFAULT_KERNEL_C_FLAGS "-xc -std=c11 -D__CBUILD__ -fno-math-errno -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") --set(DEFAULT_KERNEL_CXX_FLAGS "-xc++ -std=c++11 -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") -+set(DEFAULT_KERNEL_C_FLAGS "-xc -D__CBUILD__ -fno-math-errno -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") -+set(DEFAULT_KERNEL_CXX_FLAGS "-xc++ -fno-stack-protector -fPIC ${FLOATCONV_FLAG}") - - set(EXTRA_KERNEL_FLAGS "" CACHE STRING "Extra arguments to all kernel compilation commands (defaults to empty)") - set(EXTRA_KERNEL_CL_FLAGS "" CACHE STRING "Extra arguments to kernel CL compiler (defaults to empty)") --- tests/regression/CMakeLists.txt.orig 2019-12-30 19:15:16.490362000 +0000 +++ tests/regression/CMakeLists.txt 2019-12-30 19:15:30.527613525 +0000 @@ -53,7 +53,7 @@ From 8c3ed0388447032ffafab6f920874484388a5959 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 4 Jan 2020 10:34:11 +0000 Subject: [PATCH 4/5] Switch patch to undef bool and vec when using altivec.h --- .../easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb | 6 +++--- .../easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb | 6 +++--- ...l-1.4_undef-bool-and-vector-from-altivec.patch | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 easybuild/easyconfigs/p/pocl/pocl-1.4_undef-bool-and-vector-from-altivec.patch diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb index d2e92d335d5..0268b398ebd 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-GCC-8.3.0.eb @@ -7,14 +7,14 @@ homepage = 'http://portablecl.org' description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" toolchain = {'name': 'GCC', 'version': '8.3.0'} -toolchainopts = {'cstd': 'gnu++11'} source_urls = ['https://github.com/pocl/pocl/archive/'] sources = ['v%(version)s.tar.gz'] -patches = ['%(name)s-%(version)s_remove-c11-std.patch'] +patches = ['%(name)s-%(version)s_undef-bool-and-vector-from-altivec.patch'] checksums = [ 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz - 'd3b34f64b9142a857aa601c13220159b8fa21a51e93d8aaacd8d949588fd9af1', # pocl-1.4_remove-c11-std.patch + # pocl-1.4_undef-bool-and-vector-from-altivec.patch + 'e795b7db34ebae71ee206ad88dcf93b6691bbc3c179d346d6385ded0767d49ce', ] builddependencies = [ diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb index 1ddebc3094d..84d25740654 100644 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4-gcccuda-2019b.eb @@ -7,14 +7,14 @@ homepage = 'http://portablecl.org' description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard" toolchain = {'name': 'gcccuda', 'version': '2019b'} -toolchainopts = {'cstd': 'gnu++11'} source_urls = ['https://github.com/pocl/pocl/archive/'] sources = ['v%(version)s.tar.gz'] -patches = ['%(name)s-%(version)s_remove-c11-std.patch'] +patches = ['%(name)s-%(version)s_undef-bool-and-vector-from-altivec.patch'] checksums = [ 'ec237faa83bb1c803fbdf7c6e83d8a2ad68b6f0ed1879c3aa16c0e1dcc478742', # v1.4.tar.gz - 'd3b34f64b9142a857aa601c13220159b8fa21a51e93d8aaacd8d949588fd9af1', # pocl-1.4_remove-c11-std.patch + # pocl-1.4_undef-bool-and-vector-from-altivec.patch + 'e795b7db34ebae71ee206ad88dcf93b6691bbc3c179d346d6385ded0767d49ce', ] builddependencies = [ diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4_undef-bool-and-vector-from-altivec.patch b/easybuild/easyconfigs/p/pocl/pocl-1.4_undef-bool-and-vector-from-altivec.patch new file mode 100644 index 00000000000..b8c7ffb3915 --- /dev/null +++ b/easybuild/easyconfigs/p/pocl/pocl-1.4_undef-bool-and-vector-from-altivec.patch @@ -0,0 +1,15 @@ +Undefine altivec.h bool and vector, otherwise these conflict with the c++11 standard defintions +and that causes the build to fail on ppc64le. +Patch by Simon Branford, University of Birmingham +diff -aur pocl-1.4.orig/include/CL/cl_platform.h pocl-1.4/include/CL/cl_platform.h +--- pocl-1.4.orig/include/CL/cl_platform.h 2020-01-03 09:55:56.986465000 +0000 ++++ pocl-1.4/include/CL/cl_platform.h 2020-01-03 09:59:18.058173021 +0000 +@@ -356,6 +356,8 @@ + /* Define basic vector types */ + #if defined( __VEC__ ) + #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ ++ #undef bool ++ #undef vector + typedef __vector unsigned char __cl_uchar16; + typedef __vector signed char __cl_char16; + typedef __vector unsigned short __cl_ushort8; From f6b73e8b13fdb7464c12ef9e3097a703ba51d3e9 Mon Sep 17 00:00:00 2001 From: Simon Branford <4967+branfosj@users.noreply.github.com> Date: Sat, 4 Jan 2020 10:34:59 +0000 Subject: [PATCH 5/5] remove unneeded patch --- .../p/pocl/pocl-1.4_remove-c11-std.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch diff --git a/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch b/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch deleted file mode 100644 index c9f225cdb4a..00000000000 --- a/easybuild/easyconfigs/p/pocl/pocl-1.4_remove-c11-std.patch +++ /dev/null @@ -1,23 +0,0 @@ -c++11 std causes the build to fail on ppc64le, so stop it being set in various CMake files -Patch by Simon Branford, University of Birmingham ---- cmake/LLVM.cmake.orig 2019-12-30 18:43:07.077199000 +0000 -+++ cmake/LLVM.cmake 2019-12-30 18:44:37.953255342 +0000 -@@ -96,6 +96,7 @@ - string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CFLAGS "${LLVM_CFLAGS}") - run_llvm_config(LLVM_CXXFLAGS --cxxflags) - string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") -+string(REPLACE "-std=c++11" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") - run_llvm_config(LLVM_CPPFLAGS --cppflags) - string(REPLACE "${LLVM_PREFIX}" "${LLVM_PREFIX_CMAKE}" LLVM_CPPFLAGS "${LLVM_CPPFLAGS}") - run_llvm_config(LLVM_LDFLAGS --ldflags) ---- tests/regression/CMakeLists.txt.orig 2019-12-30 19:15:16.490362000 +0000 -+++ tests/regression/CMakeLists.txt 2019-12-30 19:15:30.527613525 +0000 -@@ -53,7 +53,7 @@ - if (MSVC) - add_compile_options(${OPENCL_CFLAGS}) - else () -- add_compile_options("-std=c++11" "-Wno-deprecated" "-Wno-deprecated-declarations" ${OPENCL_CFLAGS}) -+ add_compile_options("-Wno-deprecated" "-Wno-deprecated-declarations" ${OPENCL_CFLAGS}) - endif () - - add_definitions("-DSRCDIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"")