Skip to content

macOS + GNU build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-a-potts merged 1 commit into from
Nov 25, 2019
Merged

macOS + GNU build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
message("setting intel true")
set(IntelComp true )
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU*")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU*" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang*")
set(GNUComp true )
elseif(CMAKE_CXX_COMPILER_ID MATCHES "pgc*")
set(PGIComp true )
Expand All @@ -28,9 +28,18 @@ if( (BUILD_RELEASE) OR (BUILD_PRODUCTION) )
set(CMAKE_Fortran_8_FLAGS "-O3 -auto -qopenmp -i8 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -qopenmp -DLINUX " CACHE INTERNAL "" )
set(CMAKE_Fortran_4_FLAGS "-O3 -auto -qopenmp -DLINUX -i4 -convert big_endian -assume byterecl -fp-model strict -real-size 32 -fpp -qopenmp" CACHE INTERNAL "" )
elseif(GNUComp)
elseif(PGIComp)
message("setting gnu flags")
if (APPLE)
set(TMP_PLATFORM_FLAG "-DAPPLE")
elseif (UNIX)
set(TMP_PLATFORM_FLAG "-DLINUX")
endif()
set(CMAKE_Fortran_d_FLAGS "-O3 -fdefault-real-8 -fconvert=big-endian -cpp ${TMP_PLATFORM_FLAG} " CACHE INTERNAL "" )
set(CMAKE_Fortran_8_FLAGS "-O3 -fdefault-integer-8 -fdefault-real-8 -fconvert=big-endian -cpp ${TMP_PLATFORM_FLAG} " CACHE INTERNAL "" )
set(CMAKE_Fortran_4_FLAGS "-O3 -fconvert=big-endian -cpp ${TMP_PLATFORM_FLAG} " CACHE INTERNAL "" )
unset(TMP_PLATFORM_FLAG)
else()
message("unkown compiler!")
message("unknown compiler!")
exit()
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/fftpack.F
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if LINUX
#if defined LINUX || defined APPLE
SUBROUTINE dcrft(init,x,ldx,y,ldy,n,m,isign,scale,
& table,n1,wrk,n2,z,nz)

Expand Down
2 changes: 1 addition & 1 deletion src/ncpus.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ FUNCTION NCPUS()
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
INTEGER NTHREADS, TID, OMP_GET_NUM_THREADS,OMP_GET_THREAD_NUM
C Obtain thread number
#ifdef LINUX
#if defined LINUX || defined APPLE
!$OMP PARALLEL PRIVATE(TID)
TID = OMP_GET_THREAD_NUM()
! PRINT *, '...............thread # ', TID
Expand Down