diff --git a/tutorial/training/transformation/3.4/Makefile b/tutorial/training/transformation/3.4/Makefile index bc6693c570..bcbc5a79a3 100644 --- a/tutorial/training/transformation/3.4/Makefile +++ b/tutorial/training/transformation/3.4/Makefile @@ -1,6 +1,5 @@ EXE = gol -TRANS ?= omp_trans.py include ../common.mk SRC_X90 = time_step_mod.x90 @@ -17,13 +16,8 @@ $(EXE): $(OBJ) # ------------------------ .precious: $(SRC_X90:%.x90=%.f90) -ifeq ($(TRANS), omp_trans.py) -%.f90: %.x90 +%.f90: %.x90 inline_openmp.py $(PSYCLONE) -s ./inline_openmp.py -o $*.f90 $< -else -%.f90: %.x90 - $(PSYCLONE) --backend disable-validation -s ./inline_openmp.py -o $*.f90 $< -endif %.o: %.f90 $(F90) -c $(F90FLAGS) $< diff --git a/tutorial/training/transformation/3.4/solution/Makefile b/tutorial/training/transformation/3.4/solution/Makefile index 11cb07b306..a4858acc7d 100644 --- a/tutorial/training/transformation/3.4/solution/Makefile +++ b/tutorial/training/transformation/3.4/solution/Makefile @@ -16,7 +16,7 @@ $(EXE): $(OBJ) # ------------------------ .precious: $(SRC_X90:%.x90=%.f90) -%.f90: %.x90 +%.f90: %.x90 inline_openmp.py $(PSYCLONE) -s ./inline_openmp.py -o $*.f90 $< %.o: %.f90 diff --git a/tutorial/training/transformation/3.4/solution/inline_openmp.py b/tutorial/training/transformation/3.4/solution/inline_openmp.py index d17463a159..eddd82972b 100755 --- a/tutorial/training/transformation/3.4/solution/inline_openmp.py +++ b/tutorial/training/transformation/3.4/solution/inline_openmp.py @@ -1,7 +1,7 @@ # ----------------------------------------------------------------------------- # BSD 3-Clause License # -# Copyright (c) 2018-2025, Science and Technology Facilities Council +# Copyright (c) 2024-2025, Science and Technology Facilities Council # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,16 +33,7 @@ # ----------------------------------------------------------------------------- # Author: J. Henrichs, Bureau of Meteorology -'''A simple transformation script for the introduction of OpenMP with PSyclone. -In order to use it you must first install PSyclone. See README.md in the -top-level psyclone directory. - -Once you have PSyclone installed, this script may be used by doing: - - >>> psyclone -s ./omp_levels_trans.py traldf_iso.F90 - -This should produce a lot of output, ending with generated -Fortran. +''' ''' from psyclone.transformations import MoveTrans, TransformationError