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

Update host config to resolve Pangea build issue #1395

Merged
merged 3 commits into from
Apr 22, 2021

Conversation

sytuannguyen
Copy link
Contributor

Changing mkl libs to resolve Pangea build issue

@sytuannguyen sytuannguyen requested a review from corbett5 April 15, 2021 16:55
@sytuannguyen sytuannguyen added the ci: run CUDA builds Allows to triggers (costly) CUDA jobs label Apr 15, 2021
@sytuannguyen
Copy link
Contributor Author

@corbett5 @TotoGaz plz help me to merge this.

@corbett5 corbett5 requested a review from TotoGaz April 15, 2021 17:19
@corbett5
Copy link
Contributor

It looks good to me, but I think the docker images will need to be rebuild. @TotoGaz would know.

@@ -5,31 +5,31 @@
#
########################################

set( GEOSX_TPL_DIR /workrd/SCR/GEOSX/install/gcc8/GEOSX_TPL-d348871 CACHE PATH "")
Copy link
Member

@rrsettgast rrsettgast Apr 15, 2021

Choose a reason for hiding this comment

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

@sytuannguyen Are these all just whitespace changes? You should fix your editor to not change lines that you don't actually touch.

Copy link
Contributor

Choose a reason for hiding this comment

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

No he changed the MKL libraries. I think he just made the CMake syntax consistent with how we do it elsewhere.

Copy link
Contributor Author

@sytuannguyen sytuannguyen Apr 15, 2021

Choose a reason for hiding this comment

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

Yeah I added some spaces to make it consistent with the whole code and with itself because some space after ( and before ) are added, some are missing in these files.

Copy link
Member

@rrsettgast rrsettgast Apr 17, 2021

Choose a reason for hiding this comment

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

It is lovely that GitHub choked on the non-whitespace diff...but when I said "these all just whitespace changes" I meant this file. I see the substantive diff in the other file, but non in this one.

@rrsettgast rrsettgast merged commit ab8f95e into develop Apr 22, 2021
@rrsettgast rrsettgast deleted the bugfix/sytuan/PangeaBuild branch April 22, 2021 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: run CUDA builds Allows to triggers (costly) CUDA jobs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants