Merge branch 'develop' of https://github.com/stan-dev/cmdstanpy into develop

Author: mitzimorris

cmdstanpy/compiler_opts.py

@@ -11,6 +11,9 @@
 
 STANC_OPTS = [
     'O',
+    'O0',
+    'O1',
+    'Oexperimental',
     'allow-undefined',
     'use-opencl',
     'warn-uninitialized',
@@ -127,6 +130,8 @@ def validate_stanc_opts(self) -> None:
             return
         ignore = []
         paths = None
+        has_o_flag = False
+
         for deprecated, replacement in STANC_DEPRECATED_OPTS.items():
             if deprecated in self._stanc_options:
                 if replacement:
@@ -165,6 +170,15 @@ def validate_stanc_opts(self) -> None:
                     self._cpp_options = {'STAN_OPENCL': 'TRUE'}
                 else:
                     self._cpp_options['STAN_OPENCL'] = 'TRUE'
+            elif key.startswith('O'):
+                if has_o_flag:
+                    get_logger().warning(
+                        'More than one of (O, O1, O2, Oexperimental)'
+                        'optimizations passed. Only the last one will'
+                        'be used'
+                    )
+                else:
+                    has_o_flag = True
 
         for opt in ignore:
             del self._stanc_options[opt]

test/test_compiler_opts.py

@@ -2,6 +2,7 @@
 
 import os
 import unittest
+import logging
 
 from testfixtures import LogCapture
 
@@ -19,7 +20,7 @@ def test_opts_empty_eq(self):
         opts_b = None
         self.assertTrue(opts_a == opts_b)
 
-        opts_c = CompilerOptions(stanc_options={'--O'})
+        opts_c = CompilerOptions(stanc_options={'O'})
         self.assertTrue(opts_a != opts_c != opts_b)
 
         stanc_opts = {}
@@ -72,6 +73,44 @@ def test_opts_stanc(self):
             ['STANCFLAGS+=--warn-uninitialized', 'STANCFLAGS+=--name=foo'],
         )
 
+        stanc_opts['O1'] = True
+        opts = CompilerOptions(stanc_options=stanc_opts)
+        opts.validate()
+        self.assertEqual(
+            opts.compose(),
+            [
+                'STANCFLAGS+=--warn-uninitialized',
+                'STANCFLAGS+=--name=foo',
+                'STANCFLAGS+=--O1',
+            ],
+        )
+
+        # should add to logger
+        stanc_opts['Oexperimental'] = True
+        opts = CompilerOptions(stanc_options=stanc_opts)
+        with LogCapture() as log:
+            logging.getLogger()
+
+            opts.validate()
+
+        expect = (
+            'More than one of (O, O1, O2, Oexperimental)'
+            'optimizations passed. Only the last one will'
+            'be used'
+        )
+
+        log.check_present(('cmdstanpy', 'WARNING', expect))
+
+        self.assertEqual(
+            opts.compose(),
+            [
+                'STANCFLAGS+=--warn-uninitialized',
+                'STANCFLAGS+=--name=foo',
+                'STANCFLAGS+=--O1',
+                'STANCFLAGS+=--Oexperimental',
+            ],
+        )
+
     def test_opts_stanc_deprecated(self):
         stanc_opts = {}
         stanc_opts['allow_undefined'] = True

test/test_model.py

@@ -127,23 +127,26 @@ def test_model_bad(self):
             CmdStanModel(stan_file=BERN_STAN, exe_file=BERN_EXE)
 
     def test_stanc_options(self):
-        opts = {
-            'O': True,
-            'allow-undefined': True,
-            'use-opencl': True,
-            'name': 'foo',
-        }
-        model = CmdStanModel(
-            stan_file=BERN_STAN, compile=False, stanc_options=opts
-        )
-        stanc_opts = model.stanc_options
-        self.assertTrue(stanc_opts['O'])
-        self.assertTrue(stanc_opts['allow-undefined'])
-        self.assertTrue(stanc_opts['use-opencl'])
-        self.assertTrue(stanc_opts['name'] == 'foo')
 
-        cpp_opts = model.cpp_options
-        self.assertEqual(cpp_opts['STAN_OPENCL'], 'TRUE')
+        allowed_optims = ("", "0", "1", "experimental")
+        for optim in allowed_optims:
+            opts = {
+                f'O{optim}': True,
+                'allow-undefined': True,
+                'use-opencl': True,
+                'name': 'foo',
+            }
+            model = CmdStanModel(
+                stan_file=BERN_STAN, compile=False, stanc_options=opts
+            )
+            stanc_opts = model.stanc_options
+            self.assertTrue(stanc_opts[f'O{optim}'])
+            self.assertTrue(stanc_opts['allow-undefined'])
+            self.assertTrue(stanc_opts['use-opencl'])
+            self.assertTrue(stanc_opts['name'] == 'foo')
+
+            cpp_opts = model.cpp_options
+            self.assertEqual(cpp_opts['STAN_OPENCL'], 'TRUE')
 
         with self.assertRaises(ValueError):
             bad_opts = {'X': True}