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.

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

Undoes workaround in tools/MRS for Gaea f2 issues #454

Merged
merged 1 commit into from
May 17, 2024
Merged

Undoes workaround in tools/MRS for Gaea f2 issues #454

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
6 changes: 0 additions & 6 deletions tools/MRS/Makefile.restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,11 @@ $(foreach s,01 12 02,MOM6-examples/ocean_only/circle_obcs/$(s).ignore/ocean.stat
# The above target has been temporarily split as a workaround to the breakage of srun deferred-behavior at ORNL
$(1)_ocean_only_by_dep: $(call stats-files,ocean_only,$(1),$(RESTART_STAGE).ignore)
$(1)_ocean_only:
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ocean_only_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ocean_only_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ocean_only_by_dep
$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ocean_only_by_dep
#$(1)_ice_ocean_SIS2: $(call stats-files,ice_ocean_SIS2,$(1),$(RESTART_STAGE).ignore)
# The above target has been temporarily split as a workaround to the breakage of srun deferred-behavior at ORNL
$(1)_ice_ocean_SIS2_by_dep: $(call stats-files,ice_ocean_SIS2,$(1),$(RESTART_STAGE).ignore)
$(1)_ice_ocean_SIS2:
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ice_ocean_SIS2_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ice_ocean_SIS2_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ice_ocean_SIS2_by_dep
$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_ice_ocean_SIS2_by_dep
$(1)_land_ice_ocean_LM3_SIS2: $(call stats-files,land_ice_ocean_LM3_SIS2,$(1),$(RESTART_STAGE).ignore)
$(1)_coupled_AM2_LM3_SIS: $(call stats-files,coupled_AM2_LM3_SIS/,$(1),$(RESTART_STAGE).ignore)
Expand Down
11 changes: 3 additions & 8 deletions tools/MRS/Makefile.run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ifeq ($(MEMORY),static)
define run-static-model
$(CONFIGS)/%/ocean.stats.$(1): $(CONFIGS)/%/input.nml $(CONFIGS)/%/MOM_input $(CONFIGS)/%/MOM_override
echo $(BUILD)/$(1)/$$(MODE)/static/$$*/MOM6"("$$(STATIC_NPES)")" "=>" $$@
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations && mkdir RESTART
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out exitcode $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations seaice.stats.$(1) && mkdir RESTART
cd $$(@D) && tic=$$$$(date +%s) && \
(OMP_NUM_THREADS=1 KMP_STACKSIZE=512m NC_BLKSZ=1M time $(MPIRUN) -n $$(STATIC_NPES) $$(call rel_path,$$(@D))$(BUILD)/$(1)/$$(MODE)/static/$$*/MOM6 > log.$(1).out || touch FAIL;) \
2>&1 | egrep -v 'ing coupler_init| initializ|ing |CHECKSUM::|^ *$$$$' | sed 's,^,$$@: ,' ; toc=$$$$(date +%s) ; echo $$$$(($$$$toc-$$$$tic)) > walltime.$(1).out
Expand All @@ -64,7 +64,7 @@ ifeq ($(LAYOUT),alt)
define run-dynamic-model
$(CONFIGS)/$(2)/%/ocean.stats.$(1): $(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6 $(CONFIGS)/$(2)/%/input.nml $(CONFIGS)/$(2)/%/MOM_input $(CONFIGS)/$(2)/%/MOM_override
echo $(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6"("$$(ALT_NPES)")" "=>" $$@
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations && mkdir RESTART
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out exitcode $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations seaice.stats.$(1) && mkdir RESTART
cd $$(@D) && tic=$$$$(date +%s) && \
(OMP_NUM_THREADS=1 KMP_STACKSIZE=512m NC_BLKSZ=1M time $(MPIRUN) -n $$(ALT_NPES) $$(call rel_path,$$(@D))$(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6 > log.$(1).out || touch FAIL;) \
2>&1 | egrep -v 'ing coupler_init| initializ|ing |CHECKSUM::|^ *$$$$' | sed 's,^,$$@: ,' ; toc=$$$$(date +%s) ; echo $$$$(($$$$toc-$$$$tic)) > walltime.$(1).out
Expand All @@ -80,7 +80,7 @@ else
define run-dynamic-model
$(CONFIGS)/$(2)/%/ocean.stats.$(1): $(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6 $(CONFIGS)/$(2)/%/input.nml $(CONFIGS)/$(2)/%/MOM_input $(CONFIGS)/$(2)/%/MOM_override
echo $(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6"("$$(NPES)")" "=>" $$@
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations && mkdir RESTART
cd $$(@D) && rm -rf Depth_list.nc CPU_stats.$(1) time_stamp.out exitcode $$(@F) RESTART FAIL U_velocity_truncations V_velocity_truncations seaice.stats.$(1) && mkdir RESTART
cd $$(@D) && tic=$$$$(date +%s) && \
(OMP_NUM_THREADS=1 KMP_STACKSIZE=512m NC_BLKSZ=1M time $(MPIRUN) -n $$(NPES) $$(call rel_path,$$(@D))$(BUILD)/$(1)/$$(MODE)/$$(MEMORY)/$(2)/MOM6 > log.$(1).out || touch FAIL;) \
2>&1 | egrep -v 'ing coupler_init| initializ|ing |CHECKSUM::|^ *$$$$' | sed 's,^,$$@: ,' ; toc=$$$$(date +%s) ; echo $$$$(($$$$toc-$$$$tic)) > walltime.$(1).out
Expand All @@ -105,11 +105,6 @@ $(1)_coupled_AM2_LM3_SIS2: $(call stats-files,coupled_AM2_LM3_SIS2,$(1))
# The above target has been temporarily split as a workaround to the breakage of srun deferred-behavior at ORNL
$(1)_all_by_dep: $(call stats-files,/,$(1))
$(1)_all:
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
-$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
$$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(1)_all_by_dep
endef
$(foreach c,$(COMPILERS),$(eval $(call generate-targets,$(c))))
Expand Down
Loading