From 1c4667f2f1e40bea534b7fe1a795548ab7a16eb9 Mon Sep 17 00:00:00 2001
From: Peter Lustig <peter.lustig@stud.th-deg.de>
Date: Thu, 22 Apr 2021 20:55:33 +0000
Subject: [PATCH] Master
---
parallel_worlds_0/src/CMakeLists.txt | 4 ++--
parallel_worlds_1/src/CMakeLists.txt | 4 ++--
parallel_worlds_1/src/DeviceInterface.hpp | 2 +-
parallel_worlds_2/src/CMakeLists.txt | 4 ++--
parallel_worlds_2/src/DeviceInterface.hpp | 2 +-
parallel_worlds_3/src/CMakeLists.txt | 4 ++--
parallel_worlds_3/src/DeviceInterface.hpp | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/parallel_worlds_0/src/CMakeLists.txt b/parallel_worlds_0/src/CMakeLists.txt
index 8be0ca1..eb84a46 100644
--- a/parallel_worlds_0/src/CMakeLists.txt
+++ b/parallel_worlds_0/src/CMakeLists.txt
@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
endif( MSVC )
if( UNIX )
message( "UNIX-like system: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
endif( UNIX )
find_package( OpenCV REQUIRED )
diff --git a/parallel_worlds_1/src/CMakeLists.txt b/parallel_worlds_1/src/CMakeLists.txt
index 4725493..3bf5481 100644
--- a/parallel_worlds_1/src/CMakeLists.txt
+++ b/parallel_worlds_1/src/CMakeLists.txt
@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
endif( MSVC )
if( UNIX )
message( "UNIX-like system: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
endif( UNIX )
find_package( OpenCV REQUIRED )
diff --git a/parallel_worlds_1/src/DeviceInterface.hpp b/parallel_worlds_1/src/DeviceInterface.hpp
index 6710bc6..7ffc413 100644
--- a/parallel_worlds_1/src/DeviceInterface.hpp
+++ b/parallel_worlds_1/src/DeviceInterface.hpp
@@ -82,7 +82,7 @@ private:
}
void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
- devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+ devices = findDevices(requestedDevice);
// In order to execute a kernel (OpenCL program), it is necessary to first define
// some hardware presentations:
// 1. a context that defines the devices (and thus the usable binary code)
diff --git a/parallel_worlds_2/src/CMakeLists.txt b/parallel_worlds_2/src/CMakeLists.txt
index 67aabe5..63757bd 100644
--- a/parallel_worlds_2/src/CMakeLists.txt
+++ b/parallel_worlds_2/src/CMakeLists.txt
@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
endif( MSVC )
if( UNIX )
message( "UNIX-like system: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
endif( UNIX )
find_package( OpenCV REQUIRED )
diff --git a/parallel_worlds_2/src/DeviceInterface.hpp b/parallel_worlds_2/src/DeviceInterface.hpp
index 6710bc6..7ffc413 100644
--- a/parallel_worlds_2/src/DeviceInterface.hpp
+++ b/parallel_worlds_2/src/DeviceInterface.hpp
@@ -82,7 +82,7 @@ private:
}
void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
- devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+ devices = findDevices(requestedDevice);
// In order to execute a kernel (OpenCL program), it is necessary to first define
// some hardware presentations:
// 1. a context that defines the devices (and thus the usable binary code)
diff --git a/parallel_worlds_3/src/CMakeLists.txt b/parallel_worlds_3/src/CMakeLists.txt
index 8c23766..9b02220 100644
--- a/parallel_worlds_3/src/CMakeLists.txt
+++ b/parallel_worlds_3/src/CMakeLists.txt
@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
endif( MSVC )
if( UNIX )
message( "UNIX-like system: adding compiler flags" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
endif( UNIX )
find_package( OpenCV REQUIRED )
diff --git a/parallel_worlds_3/src/DeviceInterface.hpp b/parallel_worlds_3/src/DeviceInterface.hpp
index 6710bc6..7ffc413 100644
--- a/parallel_worlds_3/src/DeviceInterface.hpp
+++ b/parallel_worlds_3/src/DeviceInterface.hpp
@@ -82,7 +82,7 @@ private:
}
void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
- devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+ devices = findDevices(requestedDevice);
// In order to execute a kernel (OpenCL program), it is necessary to first define
// some hardware presentations:
// 1. a context that defines the devices (and thus the usable binary code)
--
GitLab