Skip to content
Permalink
Browse files

arch files: remove openmp flags for not ssmp nor psmp

Remove OpenMP compilation flags from the arch files that are nor
psmp nor ssmp versions
  • Loading branch information...
shoshijak authored and alazzaro committed May 10, 2019
1 parent bd8dc14 commit a354d490d65c3531557e90ea57b370097596ff64
Showing with 10 additions and 13 deletions.
  1. +2 −3 arch/Linux-x86-64-cuda.sopt
  2. +2 −3 arch/Linux-x86-64-cudadp.sopt
  3. +1 −2 arch/Linux-x86-64-dbcsr-cuda.popt
  4. +5 −5 arch/test_tsan.sdbg
@@ -18,16 +18,15 @@ CXX = CC
CPP = cpp
NVCC = nvcc
FC = /opt/intel/fce/10.0.025/bin/ifort -FR
LD = /opt/intel/fce/10.0.025/bin/ifort -i-static -openmp
LD = /opt/intel/fce/10.0.025/bin/ifort -i-static
AR = ar -r
GPUVER = K20X

DFLAGS = -D__CUDAPW -D__FFTW3
CFLAGS = -O2
CPPFLAGS = -traditional -C $(DFLAGS) -P -I/opt/intel/mkl/10.0.1.014/include/fftw
CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
CXXOMPFLAGS = -fopenmp
NVFLAGS = $(DFLAGS) -Xcompiler='-fopenmp' --std=c++11
NVFLAGS = $(DFLAGS) --std=c++11
FCFLAGS = $(DFLAGS) -O2 -xW
MKLPATH = /opt/intel/mkl/10.0.1.014/lib/em64t/
CUDAPATH = /usr/local/cuda/lib/
@@ -18,7 +18,7 @@ CXX = CC
CPP = cpp
NVCC = /usr/local/cuda/bin/nvcc
FC = /opt/intel/fce/10.0.025/bin/ifort -FR
LD = /opt/intel/fce/10.0.025/bin/ifort -i-static -openmp
LD = /opt/intel/fce/10.0.025/bin/ifort -i-static
AR = ar -r
GPUVER = K20X

@@ -29,9 +29,8 @@ DFLAGSCU = $(DFLAGSBASE) -Dcpu_d_gemm=dgemm -Dcpu_d_symm=dsymm
CFLAGS = -O2
CPPFLAGS = -traditional -C $(DFLAGS) -P -I/opt/intel/mkl/10.0.1.014/include/fftw
CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
CXXOMPFLAGS = -fopenmp
CPPFLAGSCU = -traditional -C $(DFLAGSCU) -P -I/opt/intel/mkl/10.0.1.014/include/fftw
NVFLAGS = $(DFLAGS) -arch sm_13 -deviceemu -Xcompiler='-fopenmp' --std=c++11
NVFLAGS = $(DFLAGS) -arch sm_13 -deviceemu --std=c++11
FCFLAGS = $(DFLAGS) -O2 -xW
FCFLAGSCU = $(DFLAGSCU) -O2 -xW
MKLPATH = /opt/intel/mkl/10.0.1.014/lib/em64t/
@@ -11,11 +11,10 @@ GPUVER = K20X

CPPFLAGS =
CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
CXXOMPFLAGS = -fopenmp
DFLAGS = -D__parallel -D__SCALAPACK -D__ACC -D__DBCSR_ACC
FCFLAGS = -g -O3 -ffree-form $(DFLAGS) -I$(GFORTRAN_INC)
LDFLAGS = $(FCFLAGS)
NVFLAGS = $(DFLAGS) -g -O3 -arch sm_35 -Xcompiler='-fopenmp' --std=c++11
NVFLAGS = $(DFLAGS) -g -O3 -arch sm_35 --std=c++11

CUDAPATH = /usr/local/cuda/lib/

@@ -4,15 +4,15 @@
# needs tsan instrumented lib gomp (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55561#c15)
#
CC = cc
CPP =
CPP =
FC = gfortran
LD = gfortran

AR = ar -r

CPPFLAGS =
DFLAGS = -D__LIBINT
FCFLAGS = -gdwarf-3 -fPIE -pie -fsanitize=thread -fno-omit-frame-pointer -fopenmp -O0 -march=native -ffree-form $(DFLAGS)
LDFLAGS = $(FCFLAGS) -L/data/vjoost/libint/sanitize/install/lib/
CPPFLAGS =
DFLAGS = -D__LIBINT
FCFLAGS = -gdwarf-3 -fPIE -pie -fsanitize=thread -fno-omit-frame-pointer -O0 -march=native -ffree-form $(DFLAGS)
LDFLAGS = $(FCFLAGS) -L/data/vjoost/libint/sanitize/install/lib/
LIBS = -llapack -lblas -lderiv -lint -lstdc++

0 comments on commit a354d49

Please sign in to comment.
You can’t perform that action at this time.