Merge pull request #1663 from gppezzi/cray-stable

mark use of Cray toolchains as stable (drop --experimental requirement)
easybuilders · Mar 15, 2016 · e6a8f95 · e6a8f95
2 parents 0dfc64e + c31786e
commit e6a8f95
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/easybuild/toolchains/craycce.py b/easybuild/toolchains/craycce.py
@@ -40,6 +40,5 @@ class CrayCCE(CrayPECray, CrayMPICH, LibSci):
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain; marked as experimental."""
-        self.log.experimental("Using %s toolchain", self.NAME)
+        """Prepare to use this toolchain."""
         super(CrayCCE, self).prepare(*args, **kwargs)
diff --git a/easybuild/toolchains/craygnu.py b/easybuild/toolchains/craygnu.py
@@ -40,6 +40,5 @@ class CrayGNU(CrayPEGCC, CrayMPICH, LibSci):
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain; marked as experimental."""
-        self.log.experimental("Using %s toolchain", self.NAME)
+        """Prepare to use this toolchain."""
         super(CrayGNU, self).prepare(*args, **kwargs)
diff --git a/easybuild/toolchains/crayintel.py b/easybuild/toolchains/crayintel.py
@@ -40,6 +40,5 @@ class CrayIntel(CrayPEIntel, CrayMPICH, LibSci):
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
 
     def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain; marked as experimental."""
-        self.log.experimental("Using %s toolchain", self.NAME)
+        """Prepare to use this toolchain."""
         super(CrayIntel, self).prepare(*args, **kwargs)
diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py
@@ -717,7 +717,7 @@ def test_independence(self):
         """Test independency of toolchain instances."""
 
         # tweaking --optarch is required for Cray toolchains (craypre-<optarch> module must be available)
-        init_config(args=['--experimental'], build_options={'optarch': 'test'})
+        init_config(build_options={'optarch': 'test'})
 
         tc_cflags = {
             'CrayCCE': "-craype-verbose -O2",