Skip to content

Lift adjustable psyclone command options into adjustable flag Transmute #246

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

Open
MetBenjaminWent wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −4
Open

Lift adjustable psyclone command options into adjustable flag Transmute #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c38fc45
Lift adjustable settings into flag which can be adjusted
MetBenjaminWent Feb 11, 2026
22f669c
Update comment
MetBenjaminWent Feb 12, 2026
ace79d2
Merge branch 'main' into psyclone_transmute_flags_override
MetBenjaminWent 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
10 changes: 7 additions & 3 deletions interfaces/physics_schemes_interface/build/psyclone_transmute.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ TRANSMUTE_INCLUDE_METHOD ?= specify_include
# Set the DSL Method in use to collect the correct transformation files.
DSL := transmute

# Set default PSyclone transmute command additional options
PSYCLONE_TRANSMUTE_EXTRAS ?= -l all
#

# Find the specific files we wish to pre-processed and PSyclone from physics source
# Set our target dependency to the version of the file we are to generate after
# the psycloning step.
Expand Down Expand Up @@ -54,9 +58,9 @@ psyclone: $(SOURCE_F_FILES)
$(SOURCE_DIR)/%.f90: $(SOURCE_DIR)/%.xu90 $(OPTIMISATION_PATH)/$(DSL)/%.py
echo PSyclone with file override script $(OPTIMISATION_PATH_PSY)/$(DSL)/$*.py on $<
PYTHONPATH=$(LFRIC_BUILD)/psyclone:$(abspath $(OPTIMISATION_PATH)/$(DSL)):$(abspath ../../interfaces/physics_schemes_interface/build):$$PYTHONPATH psyclone \
-l all \
-s $(OPTIMISATION_PATH_PSY)/$(DSL)/$*.py \
-o $(SOURCE_DIR)/$*.f90 \
$(PSYCLONE_TRANSMUTE_EXTRAS) \
$<

# Where a local optimisation script exists, use it.
Expand All @@ -65,17 +69,17 @@ $(SOURCE_DIR)/%.f90: $(SOURCE_DIR)/%.xu90 $(OPTIMISATION_PATH)/$(DSL)/%.py
$(SOURCE_DIR)/%.f90: $(SOURCE_DIR)/%.xu90 $$(dir $$(OPTIMISATION_PATH_PSY)/$$(DSL)/$$*)local.py
echo PSyclone with local script $(dir $(OPTIMISATION_PATH_PSY)/$(DSL)/$*)local.py on $<
PYTHONPATH=$(LFRIC_BUILD)/psyclone:$(abspath $(OPTIMISATION_PATH)/$(DSL)):$(abspath ../../interfaces/physics_schemes_interface/build):$$PYTHONPATH psyclone \
-l all \
-s $(dir $(OPTIMISATION_PATH_PSY)/$(DSL)/$*)local.py \
-o $(SOURCE_DIR)/$*.f90 \
$(PSYCLONE_TRANSMUTE_EXTRAS) \
$<

# Where a global optimisation script exists, use it.
#
$(SOURCE_DIR)/%.f90: $(SOURCE_DIR)/%.xu90 $(OPTIMISATION_PATH)/$(DSL)/global.py
echo PSyclone with global script $(OPTIMISATION_PATH_PSY)/$(DSL)/global.py on $<
PYTHONPATH=$(LFRIC_BUILD)/psyclone:$(abspath $(OPTIMISATION_PATH)/$(DSL)):$(abspath ../../interfaces/physics_schemes_interface/build):$$PYTHONPATH psyclone \
-l all \
-s $(OPTIMISATION_PATH_PSY)/$(DSL)/global.py \
-o $(SOURCE_DIR)/$*.f90 \
$(PSYCLONE_TRANSMUTE_EXTRAS) \
$<
6 changes: 5 additions & 1 deletion interfaces/physics_schemes_interface/build/psyclone_transmute_pass.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ TRANSMUTE_INCLUDE_METHOD ?= specify_include
# Set the DSL Method in use to collect the correct transformation files.
DSL := transmute

# Set default PSyclone transmute command additional options
PSYCLONE_TRANSMUTE_EXTRAS ?= -l all
#

# Find the specific files we wish to pre-processed and PSyclone from physics source
# Set our target dependency to the version of the file we are to generate after
# the psycloning step.
Expand All @@ -35,6 +39,6 @@ psyclone_pass: $(SOURCE_F_FILES_PASS)
$(SOURCE_DIR)/%.f90: $(SOURCE_DIR)/%.xu90
echo PSyclone pass with no optimisation applied, OMP and Clauses removed on $<
PYTHONPATH=$(LFRIC_BUILD)/psyclone:$(abspath ../../interfaces/physics_schemes_interface/build):$$PYTHONPATH psyclone \
-l all \
-o $(SOURCE_DIR)/$*.f90 \
$(PSYCLONE_TRANSMUTE_EXTRAS) \
$<