Add unit test to track deprecated, and update app definitions

Author: Bob

lib/ramble/ramble/language/shared_language.py

@@ -110,15 +110,14 @@ def _execute_figure_of_merit(obj):
 
 
 @shared_directive('compilers')
-@deprecation.deprecated(deprecated_in="(0, 4, 0)", removed_in="(0, 5, 0)",
-                        current_version=str(ramble.ramble_version_info),
+@deprecation.deprecated(deprecated_in="0.4.0", removed_in="0.5.0",
+                        current_version=str(ramble.ramble_version),
                         details="Use the define_compiler directive instead")
 def default_compiler(name, spack_spec, compiler_spec=None, compiler=None):
     """Deprecated: See `define_compiler` instead"""
 
-    logger.warn('Use of deprecated directive `default_compiler`')
-
     def _execute_default_compiler(obj):
+        logger.warn(f'Use of deprecated directive `default_compiler` in {obj.name}')
         if hasattr(obj, 'uses_spack') and getattr(obj, 'uses_spack'):
             obj.compilers[name] = {
                 'spack_spec': spack_spec,
@@ -128,6 +127,7 @@ def _execute_default_compiler(obj):
 
     return _execute_default_compiler
 
+
 @shared_directive('compilers')
 def define_compiler(name, spack_spec, compiler_spec=None, compiler=None):
     """Defines the compiler that will be used with this object

lib/ramble/ramble/test/application_language.py

@@ -9,6 +9,7 @@
 
 import pytest
 import enum
+import deprecation
 
 from ramble.appkit import *  # noqa
 
@@ -212,6 +213,7 @@ def add_input_file(app_inst, input_num=1, func_type=func_types.directive):
 
 
 # TODO: can this be dried with the modifier language add_compiler?
+@deprecation.fail_if_not_removed
 def add_compiler(app_inst, spec_num=1, func_type=func_types.directive):
     spec_name = 'Compiler%spec_num'
     spec_spack_spec = f'compiler_base@{spec_num}.0 +var1 ~var2'
@@ -224,11 +226,15 @@ def add_compiler(app_inst, spec_num=1, func_type=func_types.directive):
     }
 
     if func_type == func_types.directive:
-        define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
+        default_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
                          compiler_spec=spec_compiler_spec)(app_inst)
+        define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
+                        compiler_spec=spec_compiler_spec)(app_inst)
     elif func_type == func_types.method:
-        app_inst.define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
+        app_inst.default_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
                                   compiler_spec=spec_compiler_spec)
+        app_inst.define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
+                                 compiler_spec=spec_compiler_spec)
     else:
         assert False
 
@@ -242,11 +248,11 @@ def add_compiler(app_inst, spec_num=1, func_type=func_types.directive):
     }
 
     if func_type == func_types.directive:
-        define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
-                         compiler_spec=spec_compiler_spec)(app_inst)
+        define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: f405
+                        compiler_spec=spec_compiler_spec)(app_inst)
     elif func_type == func_types.method:
         app_inst.define_compiler(spec_name, spack_spec=spec_spack_spec,  # noqa: F405
-                                  compiler_spec=spec_compiler_spec)
+                                 compiler_spec=spec_compiler_spec)
     else:
         assert False
 

var/ramble/repos/builtin.mock/modifiers/spack-failed-reqs/modifier.py

@@ -17,9 +17,9 @@ class SpackFailedReqs(SpackModifier):
 
     mode('default', description='This is the default mode for the spack-failed-reqs modifier')
 
-    default_compiler('mod_compiler',
-                     spack_spec='[email protected] target=x86_64',
-                     compiler_spec='[email protected]')
+    define_compiler('mod_compiler',
+                    spack_spec='[email protected] target=x86_64',
+                    compiler_spec='[email protected]')
 
     software_spec('mod_package1',
                   spack_spec='[email protected]',

var/ramble/repos/builtin.mock/modifiers/spack-mod/modifier.py

@@ -19,9 +19,9 @@ class SpackMod(SpackModifier):
 
     package_manager_config('enable_debug', 'config:debug:true')
 
-    default_compiler('mod_compiler',
-                     spack_spec='[email protected] target=x86_64',
-                     compiler_spec='[email protected]')
+    define_compiler('mod_compiler',
+                    spack_spec='[email protected] target=x86_64',
+                    compiler_spec='[email protected]')
 
     software_spec('mod_package1',
                   spack_spec='[email protected]',

var/ramble/repos/builtin/applications/cloverleaf/application.py

@@ -20,7 +20,7 @@ class Cloverleaf(SpackApplication):
 
     tags('cfd', 'fluid', 'dynamics', 'euler', 'miniapp', 'minibenchmark', 'mini-benchmark')
 
-    default_compiler('gcc12', spack_spec='[email protected]')
+    define_compiler('gcc12', spack_spec='[email protected]')
 
     software_spec('ompi414', spack_spec='[email protected] +legacylaunchers +cxx',
                   compiler='gcc12')

var/ramble/repos/builtin/applications/elk/application.py

@@ -59,6 +59,6 @@ class Elk(ExecutableApplication):
     for metric in metrics:
         figure_of_merit(metric,
                         log_file=output_file,
-                        fom_regex=f'\s*(?P<metric>{metric})\s+:\s+(?P<value>[0-9]+\.[0-9]*).*',
+                        fom_regex=rf'\s*(?P<metric>{metric})\s+:\s+(?P<value>[0-9]+\.[0-9]*).*',
                         group_name='value', units='s'
                         )

var/ramble/repos/builtin/applications/gromacs/application.py

@@ -19,7 +19,7 @@ class Gromacs(SpackApplication):
 
     tags('molecular-dynamics')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
     software_spec('impi2018', spack_spec='[email protected]')
     software_spec('gromacs', spack_spec='[email protected]', compiler='gcc9')
 

var/ramble/repos/builtin/applications/hmmer/application.py

@@ -28,7 +28,7 @@ class Hmmer(SpackApplication):
 
     tags('molecular-dynamics', 'hidden-markov-models', 'bio-molecule')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('impi_2018', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/hpcc/application.py

@@ -28,7 +28,7 @@ class Hpcc(SpackApplication):
 
     tags('benchmark-app', 'mini-app', 'benchmark', 'DGEMM')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('impi2018',
                   spack_spec='[email protected]')

var/ramble/repos/builtin/applications/hpcg/application.py

@@ -19,7 +19,7 @@ class Hpcg(SpackApplication):
 
     tags('benchmark-app', 'mini-app', 'benchmark')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('impi2018',
                   spack_spec='[email protected]')

var/ramble/repos/builtin/applications/hpl/application.py

@@ -25,7 +25,7 @@ class Hpl(SpackApplication):
 
     tags('benchmark-app', 'benchmark', 'linpack')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('impi_2018', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/intel-hpl/application.py

@@ -25,7 +25,7 @@ class IntelHpl(SpackApplication):
 
     tags('benchmark-app', 'benchmark', 'linpack', 'optimized', 'intel', 'mkl')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
     software_spec('imkl_2023p1', spack_spec='[email protected] threads=openmp', compiler='gcc9')
     software_spec('impi_2018', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/intel-mpi-benchmarks/application.py

@@ -29,7 +29,7 @@ class IntelMpiBenchmarks(SpackApplication):
 
     tags('micro-benchmark', 'benchmark', 'mpi')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
     software_spec('impi2018', spack_spec='[email protected]')
     software_spec('intel-mpi-benchmarks',
                   spack_spec='[email protected]',

var/ramble/repos/builtin/applications/ior/application.py

@@ -18,7 +18,7 @@ class Ior(SpackApplication):
 
     tags('synthetic-benchmarks', 'IO')
 
-    default_compiler('gcc', spack_spec='gcc')
+    define_compiler('gcc', spack_spec='gcc')
     software_spec('openmpi', spack_spec='openmpi')
     software_spec('ior', spack_spec='ior', compiler='gcc')
 

var/ramble/repos/builtin/applications/iperf2/application.py

@@ -17,7 +17,7 @@ class Iperf2(SpackApplication):
 
     maintainers('rfbgo')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('iperf2',
                   spack_spec='[email protected]',

var/ramble/repos/builtin/applications/lammps/application.py

@@ -18,7 +18,7 @@ class Lammps(SpackApplication):
 
     tags('molecular-dynamics')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('impi2018', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/lulesh/application.py

@@ -19,7 +19,7 @@ class Lulesh(SpackApplication):
 
     tags('proxy-app', 'mini-app')
 
-    default_compiler('gcc13', spack_spec='[email protected]')
+    define_compiler('gcc13', spack_spec='[email protected]')
 
     software_spec('impi2018',
                   spack_spec='[email protected]')

var/ramble/repos/builtin/applications/md-test/application.py

@@ -18,7 +18,7 @@ class MdTest(SpackApplication):
 
     tags('synthetic-benchmarks', 'IO')
 
-    default_compiler('gcc', spack_spec='gcc')
+    define_compiler('gcc', spack_spec='gcc')
     software_spec('openmpi', spack_spec='openmpi')
 
     # The IOR spack package also includes MDTest, but we implement it as a

var/ramble/repos/builtin/applications/minixyce/application.py

@@ -19,7 +19,7 @@ class Minixyce(SpackApplication):
 
     tags('circuitdesign', 'miniapp', 'mini-app', 'minibenchmark', 'mini-benchmark')
 
-    default_compiler('gcc12', spack_spec="[email protected]")
+    define_compiler('gcc12', spack_spec="[email protected]")
 
     software_spec('ompi415cxx', spack_spec='[email protected] +legacylaunchers +cxx',
                   compiler='gcc12')

var/ramble/repos/builtin/applications/namd/application.py

@@ -21,7 +21,7 @@ class Namd(SpackApplication):
 
     tags('molecular-dynamics', 'charm++', 'task-parallelism')
 
-    default_compiler('gcc12', spack_spec='[email protected]')
+    define_compiler('gcc12', spack_spec='[email protected]')
 
     software_spec('impi2021p8', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/openfoam/application.py

@@ -19,7 +19,7 @@ class Openfoam(SpackApplication):
 
     tags('cfd', 'fluid', 'dynamics')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('ompi412',
                   spack_spec='[email protected] +legacylaunchers +cxx',

var/ramble/repos/builtin/applications/osu-micro-benchmarks/application.py

@@ -18,7 +18,7 @@ class OsuMicroBenchmarks(SpackApplication):
 
     tags('synthetic-benchmarks')
 
-    default_compiler('gcc', spack_spec='gcc')
+    define_compiler('gcc', spack_spec='gcc')
     software_spec('openmpi', spack_spec='openmpi')
     software_spec('osu-micro-benchmarks', spack_spec='osu-micro-benchmarks',
                   compiler='gcc')

var/ramble/repos/builtin/applications/quantum-espresso/application.py

@@ -19,7 +19,7 @@ class QuantumEspresso(SpackApplication):
 
     tags('electronic-structure', 'materials', 'dft', 'density-functional-theory', 'plane-waves', 'pseudopotentials')
 
-    default_compiler('gcc13', spack_spec='[email protected]')
+    define_compiler('gcc13', spack_spec='[email protected]')
 
     software_spec('impi2021p8', spack_spec='[email protected]')
     software_spec('quantum-espresso', spack_spec='[email protected]', compiler='gcc13')

var/ramble/repos/builtin/applications/streamc/application.py

@@ -19,7 +19,7 @@ class Streamc(SpackApplication):
 
     tags('memorybenchmark', 'microbenchmark', 'memory-benchmark', 'micro-benchmark')
 
-    default_compiler('gcc12', spack_spec='[email protected]')
+    define_compiler('gcc12', spack_spec='[email protected]')
 
     software_spec('streamc',
                   spack_spec='[email protected] +openmp cflags="-O3 -DSTREAM_ARRAY_SIZE=80000000 -DNTIMES=20"',

var/ramble/repos/builtin/applications/ufs-weather-model/application.py

@@ -19,7 +19,7 @@ class UfsWeatherModel(SpackApplication):
 
     tags('nwp', 'weather')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('ompi415', spack_spec="[email protected]", compiler='gcc9')
 

var/ramble/repos/builtin/applications/wrfv3/application.py

@@ -19,7 +19,7 @@ class Wrfv3(SpackApplication):
 
     tags('nwp', 'weather')
 
-    default_compiler('gcc8', spack_spec='[email protected]')
+    define_compiler('gcc8', spack_spec='[email protected]')
 
     software_spec('impi2018', spack_spec='[email protected]')
 

var/ramble/repos/builtin/applications/wrfv4/application.py

@@ -19,7 +19,7 @@ class Wrfv4(SpackApplication):
 
     tags('nwp', 'weather')
 
-    default_compiler('gcc9', spack_spec='[email protected]')
+    define_compiler('gcc9', spack_spec='[email protected]')
 
     software_spec('intel-mpi', spack_spec="[email protected]",
                   compiler='gcc9')