Fix location setting after install_cmdstan()

Author: WardBrian

.github/workflows/main.yml

@@ -96,14 +96,14 @@ jobs:
         run: |
           install_cmdstan -h
           install_cxx_toolchain -h
-          python -m cmdstanpy.install_cmdstan --version ${{ needs.get-cmdstan-version.outputs.version }}
+          python -c "import cmdstanpy; cmdstanpy.install_cmdstan(version='${{ needs.get-cmdstan-version.outputs.version }}', cores=2)"
 
       - name: Install CmdStan (Windows)
         if: matrix.os == 'windows-latest'
         run: |
           install_cmdstan -h
           install_cxx_toolchain -h
-          python -m cmdstanpy.install_cmdstan --compiler --version ${{ needs.get-cmdstan-version.outputs.version }}
+          python -m cmdstanpy.install_cmdstan --compiler --version ${{ needs.get-cmdstan-version.outputs.version }} --cores 2
 
       - name: Run tests
         run: |

cmdstanpy/install_cmdstan.py

@@ -7,11 +7,14 @@
 example model ``bernoulli.stan``.
 
 Optional command line arguments:
+   -i, --interactive: flag, when specified ignore other arguments and
+                      ask user for settings on STDIN
    -v, --version <release> : version, defaults to latest release version
    -d, --dir <path> : install directory, defaults to '$HOME/.cmdstan
    --overwrite: flag, when specified re-installs existing version
    --progress: flag, when specified show progress bar for CmdStan download
    --verbose: flag, when specified prints output from CmdStan build process
+   --cores: int, number of cores to use when building, defaults to 1
    -c, --compiler : flag, add C++ compiler to path (Windows only)
 """
 import argparse

cmdstanpy/utils.py

@@ -151,9 +151,14 @@ def validate_cmdstan_path(path: str) -> None:
     """
     if not os.path.isdir(path):
         raise ValueError(f'No CmdStan directory, path {path} does not exist.')
+    if not os.path.isfile(os.path.join(path, "makefile")):
+        raise ValueError(
+            'CmdStan folder does not contain "makefile". '
+            f'Are you sure this is the correct path: {path}?'
+        )
     if not os.path.exists(os.path.join(path, 'bin', 'stanc' + EXTENSION)):
         raise ValueError(
-            'CmdStan installataion missing binaries. '
+            f'CmdStan installataion missing binaries in {path}/bin. '
             'Re-install cmdstan by running command "install_cmdstan '
             '--overwrite", or Python code "import cmdstanpy; '
             'cmdstanpy.install_cmdstan(overwrite=True)"'
@@ -299,7 +304,7 @@ def cxx_toolchain_path(
         if os.path.exists(os.path.join(toolchain_root, 'mingw64')):
             compiler_path = os.path.join(
                 toolchain_root,
-                'mingw64' if (sys.maxsize > 2**32) else 'mingw32',
+                'mingw64' if (sys.maxsize > 2 ** 32) else 'mingw32',
                 'bin',
             )
             if os.path.exists(compiler_path):
@@ -323,7 +328,7 @@ def cxx_toolchain_path(
         elif os.path.exists(os.path.join(toolchain_root, 'mingw_64')):
             compiler_path = os.path.join(
                 toolchain_root,
-                'mingw_64' if (sys.maxsize > 2**32) else 'mingw_32',
+                'mingw_64' if (sys.maxsize > 2 ** 32) else 'mingw_32',
                 'bin',
             )
             if os.path.exists(compiler_path):
@@ -375,7 +380,7 @@ def cxx_toolchain_path(
                 if version not in ('35', '3.5', '3'):
                     compiler_path = os.path.join(
                         toolchain_root,
-                        'mingw64' if (sys.maxsize > 2**32) else 'mingw32',
+                        'mingw64' if (sys.maxsize > 2 ** 32) else 'mingw32',
                         'bin',
                     )
                     if os.path.exists(compiler_path):
@@ -400,7 +405,7 @@ def cxx_toolchain_path(
                 else:
                     compiler_path = os.path.join(
                         toolchain_root,
-                        'mingw_64' if (sys.maxsize > 2**32) else 'mingw_32',
+                        'mingw_64' if (sys.maxsize > 2 ** 32) else 'mingw_32',
                         'bin',
                     )
                     if os.path.exists(compiler_path):
@@ -1361,7 +1366,7 @@ def install_cmdstan(
         logger.warning('CmdStan installation failed.\n%s', str(e))
         return False
 
-    set_cmdstan_path(args.dir)
+    set_cmdstan_path(os.path.join(args.dir, f"cmdstan-{args.version}"))
 
     return True
 

test/test_utils.py

@@ -6,6 +6,7 @@
 import json
 import logging
 import os
+import pathlib
 import platform
 import random
 import shutil
@@ -137,18 +138,25 @@ def test_validate_path(self):
         path_foo = os.path.abspath(os.path.join('releases', 'foo'))
         with self.assertRaisesRegex(ValueError, 'No CmdStan directory'):
             validate_cmdstan_path(path_foo)
+
+        with self.assertRaisesRegex(
+            ValueError, ".*Are you sure this is the correct path.*"
+        ):
+            set_cmdstan_path(str(DATAFILES_PATH))
+
         folder_name = ''.join(
             random.choice(string.ascii_letters) for _ in range(10)
         )
         while os.path.exists(folder_name):
             folder_name = ''.join(
                 random.choice(string.ascii_letters) for _ in range(10)
             )
-        os.makedirs(folder_name)
-        path_test = os.path.abspath(folder_name)
+        folder = pathlib.Path(folder_name)
+        folder.mkdir(parents=True)
+        (folder / "makefile").touch()
         with self.assertRaisesRegex(ValueError, 'missing binaries'):
-            validate_cmdstan_path(path_test)
-        shutil.rmtree(folder_name)
+            validate_cmdstan_path(str(folder.absolute()))
+        shutil.rmtree(folder)
 
     def test_validate_dir(self):
         with tempfile.TemporaryDirectory(