Commit 0d756600 authored by Martin Perdacher's avatar Martin Perdacher

gcc v7.3 bugfix

parent 971c8547
Pipeline #542 passed with stage
in 2 minutes and 37 seconds
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.6)
project(blasJoin) project(blasJoin)
set(UTIL_SOURCES util/dataIo.cpp util/arguments.cpp util/allocation.cpp measure/energy.cpp measure/timer.cpp) set(UTIL_SOURCES util/dataIo.cpp util/arguments.cpp util/allocation.cpp measure/timer.cpp)
set(SOURCE_FILES_SELF main.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES}) set(SOURCE_FILES_SELF main.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES})
set(SOURCE_FILES_JOIN mainJoin.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES}) set(SOURCE_FILES_JOIN mainJoin.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES})
...@@ -13,7 +13,7 @@ set(SOURCE_FILES_JOIN mainJoin.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES}) ...@@ -13,7 +13,7 @@ set(SOURCE_FILES_JOIN mainJoin.cpp blasJoin/blasJoin.cpp ${UTIL_SOURCES})
set(CMAKE_CXX_FLAGS "-std=c++11") set(CMAKE_CXX_FLAGS "-std=c++11")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=knl -mtune=knl -fpic -ffast-math -DNDEBUG -O3 -DNDDEBUG -fopenmp -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5 -lboost_system") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=knl -mtune=knl -fpic -ffast-math -DNDEBUG -O3 -DNDDEBUG -fopenmp -lboost_system -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lm -ldl")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xmic-avx512 -qopenmp -DNDEBUG -O3 -lmkl_intel_thread -liomp5 -lpthread -lmkl_core -lmkl_intel_lp64 -lboost_system") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xmic-avx512 -qopenmp -DNDEBUG -O3 -lmkl_intel_thread -liomp5 -lpthread -lmkl_core -lmkl_intel_lp64 -lboost_system")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopt-report=2") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopt-report=2")
......
#include "energy.h" #include "energy.h"
#include <sys/ioctl.h> // #include <sys/ioctl.h>
Hioki::Hioki(){ Hioki::Hioki(){
this->rs_232_open(); this->rs_232_open();
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define ENERGY_CONSUMPTION_H #define ENERGY_CONSUMPTION_H
#include <errno.h> #include <errno.h>
#include <fcntl.h> // #include <fcntl.h>
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -74,7 +74,7 @@ void parsing_args(int argc, char* argv[], size_t *n, double *epsilon, size_t *d, ...@@ -74,7 +74,7 @@ void parsing_args(int argc, char* argv[], size_t *n, double *epsilon, size_t *d,
if ( *blocksize > *n || *blocksize <= 1 ){ if ( *blocksize > *n || *blocksize <= 1 ){
fprintf (stderr, "Blocksize has to be greater than 1 and smaller or equal to N\n"); fprintf (stderr, "Blocksize has to be greater than 1 and smaller or equal to N\n");
printf("n:%d, blocksize: %d\n", *n, *blocksize);fflush(stdout); printf("n:%zu, blocksize: %zu\n", *n, *blocksize);fflush(stdout);
exit(1); exit(1);
} }
} }
...@@ -155,7 +155,7 @@ void parsing_args_join(int argc, char* argv[], size_t *n, size_t *m, double *eps ...@@ -155,7 +155,7 @@ void parsing_args_join(int argc, char* argv[], size_t *n, size_t *m, double *eps
if ( *blocksize > *n || *blocksize <= 1 ){ if ( *blocksize > *n || *blocksize <= 1 ){
fprintf (stderr, "Blocksize has to be greater than 1 and smaller or equal to N\n"); fprintf (stderr, "Blocksize has to be greater than 1 and smaller or equal to N\n");
printf("n:%d, blocksize: %d\n", *n, *blocksize);fflush(stdout); printf("n:%zu, blocksize: %zu\n", *n, *blocksize);fflush(stdout);
exit(1); exit(1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment