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

ADCIRC build support mega-update #1388

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

ADCIRC build support mega-update #1388

wants to merge 14 commits into from

Conversation

wwlwpd
Copy link
Collaborator

@wwlwpd wwlwpd commented Sep 11, 2024

Issue 1386:

Related to #1386

Testing list:

Frontera

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

Lonestar6

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

Stampede3

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

Mike III

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

QBC

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

QBD

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

Ubuntu (gfortran)

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

Ubuntu (OneAPI) (saving this one for last since most of the work was done here)

  • v53.05
  • v55.01-5bc04d6
  • v55.02
  • v56.0.2

@wwlwpd wwlwpd self-assigned this Sep 11, 2024
@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 11, 2024

building this to make sure it didn't break anything

@wwlwpd wwlwpd marked this pull request as ready for review September 11, 2024 19:16
@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 11, 2024

no problems detected

Copy link
Collaborator

@jasonfleming jasonfleming left a comment

Choose a reason for hiding this comment

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

This looks good, and well targeted in the scripting. I have not tried the updated patch sets yet, but will do so now.

@jasonfleming
Copy link
Collaborator

@wwlwpd If I build and install ASGS with intel, can I build adcirc with intel-oneapi? Or do they have to match?

@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 11, 2024

@wwlwpd If I build and install ASGS with intel, can I build adcirc with intel-oneapi? Or do they have to match?

It'll have to match. But this is required on Stampede3, so you can try i there on any ASGSes you've built before.

Sorry, this will require building from scratch.

@wwlwpd wwlwpd changed the title renamed intel-llvm to intel-oneapi Intel oneapi update (_was renamed intel-llvm to intel-oneapi_) Sep 12, 2024
@wwlwpd wwlwpd marked this pull request as draft September 12, 2024 04:05
@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 12, 2024

@jasonfleming During the testing above, I discovered that I had to remove -FI for all supported machines for Intel - so it as definitely something new that was introduced with v56 via the src/netcdf_error.F90 file. I ended up removing all instances of -FI in the whole file. I need to test Rostam, but not before this gets merged. Once I finish testing Ubuntu gfortran and Ubuntu with Intel OneAPI, this will be ready for a squash and merge. I am hopeful that will work out just fine, so will now make it ready for review.

@wwlwpd wwlwpd marked this pull request as ready for review September 12, 2024 08:18
@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 12, 2024

There are some other versions in the list I want to remove, but that can also wait.

@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 13, 2024

WWe handle it, but was able to get a clear enough picture of what's going on to submit this bug upstream to ADCIRC regarding their make build system, adcirc/adcirc#408

@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 13, 2024

Note as reference for an issue I will create, but the ADCIRC Live WSL2 VM that is build and distributed currently has the MACHINENAME=wsl-ubuntu - and all the build patches for ADCIRC go off of MACHINENAME=debian - so I will have to address this after this gets merged and I update the adcirclive branch and roll updated VMs.

@wwlwpd wwlwpd force-pushed the issue-1386 branch 2 times, most recently from 0861ad8 to 20cfcd7 Compare September 13, 2024 05:25
@wwlwpd wwlwpd added the adcirc build support related to building adcirc/swan label Sep 13, 2024
@wwlwpd wwlwpd changed the title Intel oneapi update (_was renamed intel-llvm to intel-oneapi_) Intel oneapi update (was renamed intel-llvm to intel-oneapi) Sep 13, 2024
@wwlwpd wwlwpd changed the title Intel oneapi update (was renamed intel-llvm to intel-oneapi) ADCIRC build support mega-update Sep 13, 2024
@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 13, 2024

Testing notes:

Here's the script you can use on Ubuntu:

https://github.com/StormSurgeLive/get-asgs/blob/master/prep/ubuntu-with-oneapi.sh

Note: you'll need to source the Intel .sh file or logout, back in again since that script adds a line to ~/.bashrc to do so

  . ~/.bashrc
  which ifort # should return ifort path

now move on to fresh install of ASGS ...

  git clone [email protected]:StormSurgeLive/asgs.git asgs-oneapi
  cd asgs-oneapi
  git checkout issue-1386 # for now
  ./init-asgs.sh
  # select "debian" on Ubuntu (should be detected)
  # <enter> through the Yes
  # specify "intel-oneapi"
  # ... move through the rest of the wizard and do Y to run build command

You should be able to build with no issues,

  • v53release
  • v55.01-c*
  • v55.02
  • v56.0.2

Please let me know if you have any issues or interesting things to report.

@wwlwpd
Copy link
Collaborator Author

wwlwpd commented Sep 14, 2024

I rebased this with master after merging #1386.

@wwlwpd wwlwpd force-pushed the issue-1386 branch 3 times, most recently from 8ea1991 to 0d74591 Compare September 19, 2024 00:37
Issue 1386: cleaning up redundant or outdated versions of ADCIRC
in order to reduce maintenance burden.

Related to #1386.
wwlwpd and others added 12 commits September 18, 2024 23:10
Issue 1386: Added Intel OneAPI support on Debian and Ubuntu systems that
are not handled directly in ./platforms like most HPCs are. This change
is targed towards desktop and workstation users who have installed Intel
OneAPI on to their system since Intel is now providing this free of
charge.

Related to #1386
…on Debian

For merge:

Resolves to #1386
Resolves to #1383
Resolves to #1361
Resolves to #1311
Related  to #1384 (may prove viable solution, if applied to all patchesets for
all supported ADCIRC versions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
adcirc build support related to building adcirc/swan
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants