GoogleCloudPlatform · rfbgo · Apr 2, 2024 · Mar 19, 2024 · Mar 19, 2024 · Mar 21, 2024
diff --git a/etc/ramble/defaults/spack.yaml b/etc/ramble/defaults/spack.yaml
@@ -1,4 +1,3 @@
 spack:
-  concretized: false
   packages: {}
   environments: {}
diff --git a/examples/basic_expansion_config.yaml b/examples/basic_expansion_config.yaml
@@ -29,7 +29,6 @@ ramble:
                 n_ranks: '1'
                 n_nodes: '1'
   spack:
-    concretized: true
     packages:
       gcc9:
         spack_spec: [email protected] target=x86_64

diff --git a/examples/basic_gromacs_config.yaml b/examples/basic_gromacs_config.yaml
@@ -38,7 +38,6 @@ ramble:
                 size: '0003'
                 type: 'rf'
   spack:
-    concretized: true
     packages:
       gcc9:
         spack_spec: [email protected] target=x86_64

diff --git a/examples/basic_hostname_config.yaml b/examples/basic_hostname_config.yaml
@@ -44,6 +44,5 @@ ramble:
                 n_nodes: '1'
                 processes_per_node: '16'
   spack:
-    concretized: true
     packages: {}
     environments: {}
diff --git a/examples/full_expansion_config.yaml b/examples/full_expansion_config.yaml
@@ -29,7 +29,6 @@ ramble:
                                 #(part1, 16, openfoam-skx, 2), (part1, 16, openfoam-skx, 4)
                                 #(part2, 32, openfoam-zen2, 2), (part2, 32, openfoam-zen2, 4)
   spack:
-    concretized: true
     packages:
       gcc9:
         spack_spec: [email protected] target=x86_64

diff --git a/examples/vector_gromacs_software_config.yaml b/examples/vector_gromacs_software_config.yaml
@@ -26,7 +26,6 @@ ramble:
               - n_ranks
               - gromacs_version
   spack:
-    concretized: true
     packages:
       gcc9:
         spack_spec: [email protected] target=x86_64

diff --git a/examples/vector_matrix_gromacs_config.yaml b/examples/vector_matrix_gromacs_config.yaml
@@ -23,7 +23,6 @@ ramble:
               - type
               - n_ranks
   spack:
-    concretized: true
     packages:
       gcc9:
         spack_spec: [email protected] target=x86_64

diff --git a/lib/ramble/docs/configuration_files.rst b/lib/ramble/docs/configuration_files.rst
@@ -471,7 +471,6 @@ environments created from those packages. Its format is as follows:
 .. code-block:: yaml
 
     spack:
-      concretized: [True/False] # Should be false unless defined in a concretized workspace
       [variables: {}]
       packages:
         <package_name>:

diff --git a/lib/ramble/docs/tutorials/10_using_modifiers.rst b/lib/ramble/docs/tutorials/10_using_modifiers.rst
@@ -144,7 +144,6 @@ The resulting configuration file should look like the following.
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -239,7 +238,6 @@ look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -309,7 +307,6 @@ configuration file should look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/11_using_internals.rst b/lib/ramble/docs/tutorials/11_using_internals.rst
@@ -138,7 +138,6 @@ the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -245,7 +244,6 @@ configuration file should look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -337,7 +335,6 @@ following:
                   variables:
                     n_nodes: [1, 2, 4]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/1_hello_world.rst b/lib/ramble/docs/tutorials/1_hello_world.rst
@@ -174,7 +174,6 @@ following contents:
                   variables:
                     n_ranks: '1'
       spack:
-        concretized: true
         packages: {}
         environments: {}
 

diff --git a/lib/ramble/docs/tutorials/5_changing_your_software_stack.rst b/lib/ramble/docs/tutorials/5_changing_your_software_stack.rst
@@ -80,7 +80,6 @@ The relevant portion of the workspace configuration file is:
 .. code-block:: YAML
 
     spack:
-      concretized: true
       packages:
         gcc9:
           spack_spec: [email protected] target=x86_64

diff --git a/lib/ramble/docs/tutorials/6_configuring_a_scaling_study.rst b/lib/ramble/docs/tutorials/6_configuring_a_scaling_study.rst
@@ -223,7 +223,6 @@ look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/7_using_zips_and_matrices.rst b/lib/ramble/docs/tutorials/7_using_zips_and_matrices.rst
@@ -112,7 +112,6 @@ the above section. The result should look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -203,7 +202,6 @@ should have the following in your ``ramble.yaml``:
                   - platform_config
                   - n_nodes
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -266,7 +264,6 @@ Your final configuration file should look something like:
                   - platform_config
                   - n_nodes
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/...amble/docs/tutorials/8_var_expansion_indirection_and_stack_parameterization.rst b/...amble/docs/tutorials/8_var_expansion_indirection_and_stack_parameterization.rst
@@ -95,7 +95,6 @@ final configuration from the previous tutorial.
                   - platform_config
                   - n_nodes
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -193,7 +192,6 @@ generation as well. The result might look like the following:
                   - platform_config
                   - n_nodes
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -264,7 +262,6 @@ into the matrix. The result might look like the following:
                   - n_nodes
                   - mpi_name
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -374,7 +371,6 @@ resulting configuration might look like the following:
                   - n_nodes
                   - mpi_name
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -464,7 +460,6 @@ The resulting configuration file might look like the following:
                   - n_nodes
                   - mpi_name
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/9_success_criteria.rst b/lib/ramble/docs/tutorials/9_success_criteria.rst
@@ -120,7 +120,6 @@ configuration file might look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]
@@ -195,7 +194,6 @@ resulting configuration file might look like the following:
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/mirrors.rst b/lib/ramble/docs/tutorials/mirrors.rst
@@ -65,7 +65,6 @@ Write the following configuration into the file, save, and exit:
                     n_nodes: 1
                     processes_per_node: 30
       spack:
-        concretized: false
         packages: {}
         environments: {}
 
@@ -94,7 +93,6 @@ will look something like this:
                     n_nodes: 1
                     processes_per_node: 30
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/docs/tutorials/shared/wrf_scaling_workspace.rst b/lib/ramble/docs/tutorials/shared/wrf_scaling_workspace.rst
@@ -45,7 +45,6 @@ final configuration from a previous tutorial.
                   variables:
                     n_nodes: [1, 2]
       spack:
-        concretized: true
         packages:
           gcc9:
             spack_spec: [email protected]

diff --git a/lib/ramble/ramble/cmd/workspace.py b/lib/ramble/ramble/cmd/workspace.py
@@ -340,12 +340,21 @@ def workspace_remove(args):
 
 def workspace_concretize_setup_parser(subparser):
     """Concretize a workspace"""
-    pass
+    subparser.add_argument(
+        '-f', '--force_concretize',
+        dest='force_concretize',
+        action='store_true',
+        help='Overwrite software environment configuration with defaults defined in application ' +
+              'definition',
+        required=False)
 
 
 def workspace_concretize(args):
     ws = ramble.cmd.require_active_workspace(cmd_name='workspace concretize')
 
+    if args.force_concretize:
+        ws.force_concretize = True
+
     logger.debug('Concretizing workspace')
     ws.concretize()
 

diff --git a/lib/ramble/ramble/pipeline.py b/lib/ramble/ramble/pipeline.py
@@ -118,17 +118,6 @@ def _construct_hash(self):
                                    self.workspace.hash_file_name), 'w+') as f:
                 f.write(self.workspace.workspace_hash + '\n')
 
-    def _validate(self):
-        """Perform validation that this pipeline can be executed"""
-        if not self.workspace.is_concretized():
-            error_message = 'Cannot run %s in a ' % self.name + \
-                            'non-conretized workspace\n' + \
-                            'Run `ramble workspace concretize` on this ' + \
-                            'workspace first.\n' + \
-                            'Then ensure its spack configuration is ' + \
-                            'properly configured.'
-            logger.die(error_message)
-
     def _prepare(self):
         """Perform preparation for pipeline execution"""
         pass
@@ -203,7 +192,6 @@ def run(self):
             )
 
         logger.add_log(self.log_path)
-        self._validate()
         self._prepare()
         self._execute()
         self._complete()

diff --git a/lib/ramble/ramble/schema/spack.py b/lib/ramble/ramble/schema/spack.py
@@ -23,7 +23,7 @@
         'properties': {
             'concretized': {
                 'type': 'boolean',
-                'default': False
+                'default': None
             },
             'variables': ramble.schema.variables.variables_def,
             'zips': ramble.schema.zips.zips_def,

diff --git a/lib/ramble/ramble/software_environments.py b/lib/ramble/ramble/software_environments.py
@@ -7,6 +7,10 @@
 # except according to those terms.
 
 from enum import Enum
+try:
+    import deprecation
+except ImportError:
+    print('Please use pip to install the requirements.txt')
 
 import ramble.repository
 import ramble.workspace
@@ -413,7 +417,8 @@ class SoftwareEnvironments(object):
     """Class representing a group of software environments"""
 
     _deprecated_sections = [namespace.variables, namespace.zips,
-                            namespace.matrix, namespace.matrices, namespace.exclude]
+                            namespace.matrix, namespace.matrices,
+                            namespace.exclude, 'concretized']
 
     def __init__(self, workspace):
         """SoftwareEnvironments constructor
@@ -457,6 +462,10 @@ def __str__(self):
         """
         return self.info(indent=0)
 
+    @deprecation.deprecated(deprecated_in="0.4.0", removed_in="0.5.0",
+                            current_version=str(ramble.ramble_version),
+                            details="These Spack config sections no longer required and will "
+                                    "be removed from the schema in v0.5.0")
     def _deprecated_warnings(self):
         if not self._warn_for_deprecation or hasattr(self, '_warned_deprecation'):
             return
@@ -485,9 +494,12 @@ def _deprecated_warnings(self):
             sections_to_print.append('spack:packages:<name>:exclude')
             sections_to_print.append('spack:environments:<name>:exclude')
 
+        if 'concretized' in self._warn_for_deprecation:
+            sections_to_print.append('spack:concretized')
+
         if not hasattr(self, '_warned_deprecated_variables'):
             self._warned_deprecated_variables = True
-            logger.warn('The following config sections are deprecated and ignore:')
+            logger.warn('The following config sections are deprecated and ignored:')
             for section in sections_to_print:
                 logger.warn(f'    {section}')
             logger.warn('Please remove from your configuration files.')

diff --git a/lib/ramble/ramble/test/application_language.py b/lib/ramble/ramble/test/application_language.py
@@ -9,7 +9,10 @@
 
 import pytest
 import enum
-import deprecation
+try:
+    import deprecation
+except ImportError:
+    print('Please use pip to install the requirements.txt')
 
 from ramble.appkit import *  # noqa
 

diff --git a/lib/ramble/ramble/test/application_tests.py b/lib/ramble/ramble/test/application_tests.py
@@ -486,7 +486,6 @@ def test_derive_variables_for_template_path(mutable_mock_apps_repo):
                 n_nodes: '2'
 
   spack:
-    concretized: true
     packages: {}
     environments: {}
 """

diff --git a/lib/ramble/ramble/test/cmd/on.py b/lib/ramble/ramble/test/cmd/on.py
@@ -34,9 +34,6 @@ def test_on_command(mutable_mock_workspace_path):
         ramble.test.cmd.workspace.add_basic(ws)
         ramble.test.cmd.workspace.check_basic(ws)
 
-        workspace('concretize')
-        assert ws.is_concretized()
-
         workspace('setup')
         assert os.path.exists(ws.root + '/all_experiments')
 
@@ -58,9 +55,6 @@ def test_execute_pipeline(mutable_mock_workspace_path):
         ramble.test.cmd.workspace.add_basic(ws)
         ramble.test.cmd.workspace.check_basic(ws)
 
-        ws.concretize()
-        assert ws.is_concretized()
-
         setup_pipeline = setup_pipeline_class(ws, filters)
         setup_pipeline.run()
         assert os.path.exists(ws.root + '/all_experiments')
@@ -77,9 +71,6 @@ def test_on_where(mutable_mock_workspace_path):
         ramble.test.cmd.workspace.add_basic(ws)
         ramble.test.cmd.workspace.check_basic(ws)
 
-        workspace('concretize')
-        assert ws.is_concretized()
-
         workspace('setup')
         assert os.path.exists(ws.root + '/all_experiments')
 
@@ -94,9 +85,6 @@ def test_on_executor(mutable_mock_workspace_path):
         ramble.test.cmd.workspace.add_basic(ws)
         ramble.test.cmd.workspace.check_basic(ws)
 
-        workspace('concretize')
-        assert ws.is_concretized()
-
         workspace('setup')
         assert os.path.exists(ws.root + '/all_experiments')