Skip to content
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.

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

Modifications for Cray build #283

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Modifications for Cray build #283

merged 1 commit into from
Nov 30, 2023

Conversation

mewall
Copy link
Collaborator

@mewall mewall commented Nov 30, 2023

o Add CRAY_SDK macro
o Add "integer argc" to benchmarks, depending on CRAY_SDK
o Disable testing and example builds in crusher script
o Put prg_c_interface in new progress_c library
o Only build progress_c if not Cray compiler


This change is Reviewable

@@ -28,6 +28,10 @@ program hmodel
real(dp) :: ef,sparsity,dec,mlsi,mlsf,bnorm
character(20) :: bml_dmode

#ifdef CRAY_SDK
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not correct to always define iargc as an integer?

CMakeLists.txt Outdated
@@ -36,7 +36,7 @@ add_definitions(-DPROGRESS_VERSION=${PROGRESS_VERSION})
message(STATUS "Setting PROGRESS_VERSION to '${PROGRESS_VERSION}'")

if(CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
set(EXTRA_FCFLAGS "-ef ${EXTRA_FCFLAGS}")
set(EXTRA_FCFLAGS "-ef -DCRAY_SDK ${EXTRA_FCFLAGS}")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should do that in build script, not here

@jeanlucf22
Copy link
Collaborator

Maybe a better way is to add a build option to build with or without C interface, instead of building two libraries?

o Add "integer argc" to benchmarks
o Disable testing and example builds in crusher script
o Include prg_c_interface conditionally in progress library
o Fix lint issues
@mewall
Copy link
Collaborator Author

mewall commented Nov 30, 2023 via email

@jeanlucf22 jeanlucf22 merged commit 990f74e into master Nov 30, 2023
10 checks passed
@jeanlucf22 jeanlucf22 deleted the cray_build branch November 30, 2023 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants