Skip to content

Lift adjustable psyclone command options into adjustable flag #271

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
harry-shepherd merged 4 commits into from
Feb 16, 2026
Merged

Lift adjustable psyclone command options into adjustable flag #271

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e37150
Lift adjustable psyclone command options into adjustable flag
MetBenjaminWent Feb 11, 2026
1b8de6a
Change init to occur if not already set
MetBenjaminWent Feb 11, 2026
303d9d0
Correct formatting
MetBenjaminWent Feb 12, 2026
58ac184
Merge branch 'main' into psyclone_command_flags_override
harry-shepherd Feb 16, 2026
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
21 changes: 16 additions & 5 deletions infrastructure/build/psyclone/psyclone_psykal.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
# Set the DSL Method in use to collect the correct transformation files.
DSL = psykal
#

# Set default psyclone command additional options
PSYCLONE_PSYKAL_EXTRAS ?= -l all
#

ALGORITHM_F_FILES := $(patsubst $(SOURCE_DIR)/%.X90, \
$(WORKING_DIR)/%.f90, \
$(shell find $(SOURCE_DIR) -name '*.X90' -print))
Expand Down Expand Up @@ -46,25 +51,29 @@ $(WORKING_DIR)/%.f90 $(WORKING_DIR)/%_psy.f90: \
$(WORKING_DIR)/%.x90 $$(OPTIMISATION_PATH)/$(DSL)/$$*.py | $$(dir $$@)
$(call MESSAGE,PSyclone - local optimisation,$(subst $(SOURCE_DIR)/,,$<))
$QPYTHONPATH=$(LFRIC_BUILD)/psyclone:$$PYTHONPATH psyclone -api lfric \
-l all -d $(WORKING_DIR) \
-d $(WORKING_DIR) \
--config $(PSYCLONE_CONFIG_FILE) \
-s $(OPTIMISATION_PATH)/$(DSL)/$*.py \
-okern $(WORKING_DIR)/kernel \
-oalg $(WORKING_DIR)/$*.f90 \
-opsy $(WORKING_DIR)/$*_psy.f90 $<
-opsy $(WORKING_DIR)/$*_psy.f90 \
$(PSYCLONE_PSYKAL_EXTRAS) \
$<

# Where a global optimisation script exists, use it.
#
$(WORKING_DIR)/%.f90 $(WORKING_DIR)/%_psy.f90: \
$(WORKING_DIR)/%.x90 $(OPTIMISATION_PATH)/$(DSL)/global.py | $$(dir $$@)
$(call MESSAGE,PSyclone - global optimisation,$(subst $(SOURCE_DIR)/,,$<))
$QPYTHONPATH=$(LFRIC_BUILD)/psyclone:$$PYTHONPATH psyclone -api lfric \
-l all -d $(WORKING_DIR) \
-d $(WORKING_DIR) \
--config $(PSYCLONE_CONFIG_FILE) \
-s $(OPTIMISATION_PATH)/$(DSL)/global.py \
-okern $(WORKING_DIR)/kernel \
-oalg $(WORKING_DIR)/$*.f90 \
-opsy $(WORKING_DIR)/$*_psy.f90 $<
-opsy $(WORKING_DIR)/$*_psy.f90 \
$(PSYCLONE_PSYKAL_EXTRAS) \
$<

# Where no optimisation script exists, don't use it.
#
Expand All @@ -76,7 +85,9 @@ $(WORKING_DIR)/%.x90 | $$(dir $$@)
--config $(PSYCLONE_CONFIG_FILE) \
-okern $(WORKING_DIR)/kernel \
-oalg $(WORKING_DIR)/$*.f90 \
-opsy $(WORKING_DIR)/$*_psy.f90 $<
-opsy $(WORKING_DIR)/$*_psy.f90 \
$(PSYCLONE_PSYKAL_EXTRAS) \
$<

.PRECIOUS: $(WORKING_DIR)/%.x90
# Perform preprocessing for big X90 files.
Expand Down