Merge pull request #422 from stan-dev/bugfix/261-cpp-opts

Remove cpp option whitelist

Author: mitzimorris

cmdstanpy/compiler_opts.py

@@ -40,14 +40,6 @@
     'version',
 ]
 
-CPP_OPTS = [
-    'STAN_OPENCL',
-    'OPENCL_DEVICE_ID',
-    'OPENCL_PLATFORM_ID',
-    'STAN_MPI',
-    'STAN_THREADS',
-]
-
 
 class CompilerOptions:
     """
@@ -151,18 +143,10 @@ def validate_cpp_opts(self) -> None:
         """
         if self._cpp_options is None:
             return
-        if (
-            'OPENCL_DEVICE_ID' in self._cpp_options.keys()
-            or 'OPENCL_PLATFORM_ID' in self._cpp_options.keys()
-        ):
-            self._cpp_options['STAN_OPENCL'] = 'TRUE'
-
-        for key, val in self._cpp_options.items():
-            if key not in CPP_OPTS:
-                raise ValueError(
-                    'unknown CmdStan makefile option: {}'.format(key)
-                )
-            if key in ['OPENCL_DEVICE_ID', 'OPENCL_PLATFORM_ID']:
+        for key in ['OPENCL_DEVICE_ID', 'OPENCL_PLATFORM_ID']:
+            if key in self._cpp_options:
+                self._cpp_options['STAN_OPENCL'] = 'TRUE'
+                val = self._cpp_options[key]
                 if not isinstance(val, int) or val < 0:
                     raise ValueError(
                         '{} must be a non-negative integer value,'

test/test_compiler_opts.py

@@ -121,11 +121,6 @@ def test_opts_cpp(self):
         opts.validate()
         self.assertEqual(opts.compose(), ['STAN_MPI=TRUE'])
 
-        cpp_opts['STAN_BAD'] = 'TRUE'
-        opts = CompilerOptions(cpp_options=cpp_opts)
-        with self.assertRaises(ValueError):
-            opts.validate()
-
     def test_opts_cpp_opencl(self):
         cpp_opts = {'OPENCL_DEVICE_ID': 1}
         opts = CompilerOptions(cpp_options=cpp_opts)