Make arbor-build-catalogue part of pyarb.

CMakeLists.txt

@@ -269,9 +269,7 @@ add_library(arborio-public-deps INTERFACE)
 install(TARGETS arborio-public-deps EXPORT arborio-targets)
 
 # Add scripts and supporting CMake for setting up external catalogues
-
 install(PROGRAMS scripts/arbor-build-catalogue DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES mechanisms/BuildModules.cmake DESTINATION ${ARB_INSTALL_DATADIR})
 
 # Add all dependencies.
 

arbor/include/arbor/util/expected.hpp

@@ -484,13 +484,9 @@ struct expected<void, E> {
     // No emplace ops.
 
     // Swap ops.
-
-    void swap(expected& other) {
-        data_.swap(other.data);
-    }
+    void swap(expected& other) { data_.swap(other.data_); }
 
     // Accessors.
-
     bool has_value() const noexcept { return !data_; }
     explicit operator bool() const noexcept { return has_value(); }
 

arbor/profile/profiler.cpp

@@ -145,7 +145,7 @@ const std::vector<profile_accumulator>& recorder::accumulators() const {
 
 void recorder::enter(region_id_type index) {
     if (index_!=npos) {
-        throw std::runtime_error("recorder::enter without matching recorder::leave");
+        throw std::runtime_error("recorder::enter without matching recorder::leave, still active: " + region_names_(index_));
     }
     if (index>=accumulators_.size()) {
         accumulators_.resize(index+1);

pyproject.toml

@@ -28,8 +28,8 @@ dependencies = [
 ]
 
 [project.scripts]
-modcc = "arbor:modcc"
-arbor-build-catalogue = "arbor:build_catalogue"
+modcc = "arbor.modcc:cli"
+arbor-build-catalogue = "arbor.build_catalogue:cli"
 
 [tool.scikit-build]
 cmake.args = [

python/CMakeLists.txt

@@ -82,6 +82,19 @@ set_target_properties(pyarb PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${python_mod_pa
 file(COPY "${PROJECT_SOURCE_DIR}/python/__init__.py" DESTINATION "${python_mod_path}")
 file(COPY "${PROJECT_SOURCE_DIR}/VERSION" DESTINATION "${python_mod_path}")
 
+configure_file("${PROJECT_SOURCE_DIR}/scripts/arbor-build-catalogue"
+               "${CMAKE_BINARY_DIR}/bin/arbor-build-catalogue"
+               FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE
+               COPYONLY)
+configure_file("${PROJECT_SOURCE_DIR}/scripts/arbor-build-catalogue"
+               "${python_mod_path}/build_catalogue.py"
+               NO_SOURCE_PERMISSIONS
+               COPYONLY)
+configure_file("${PROJECT_SOURCE_DIR}/python/modcc.py"
+               "${python_mod_path}/modcc.py"
+               NO_SOURCE_PERMISSIONS
+               COPYONLY)
+
 # Set the installation path
 
 # Ask Python where it keeps its system (platform) packages.
@@ -106,7 +119,7 @@ mark_as_advanced(FORCE ARB_PYTHON_LIB_PATH)
 if(ARB_BUILD_PYTHON_STUBS)
   find_python_module(pybind11_stubgen REQUIRED)
 else()
-    find_python_module(pybind11_stubgen)
+  find_python_module(pybind11_stubgen)
 endif()
 if(HAVE_PYBIND11_STUBGEN)
   add_custom_command(TARGET pyarb POST_BUILD
@@ -117,7 +130,8 @@ if(HAVE_PYBIND11_STUBGEN)
                      COMMENT "Generating type stubs")
 endif()
 
-if(DEFINED SKBUILD_PROJECT_NAME)
+if(DEFINED
+    SKBUILD_PROJECT_NAME)
   # Building wheel through scikit-build-core
   set(_python_module_install_path .)
 else()
@@ -129,4 +143,8 @@ if(HAVE_PYBIND11_STUBGEN)
   install(DIRECTORY ${CMAKE_BINARY_DIR}/stubs/arbor/ DESTINATION ${_python_module_install_path})
 endif()
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${_python_module_install_path})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/modcc.py DESTINATION ${_python_module_install_path})
+install(FILES ${PROJECT_SOURCE_DIR}/scripts/arbor-build-catalogue
+        DESTINATION ${_python_module_install_path}
+        RENAME build_catalogue.py)
 install(FILES ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/README.md ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${_python_module_install_path})

python/__init__.py

@@ -16,33 +16,6 @@ def get_version():
         return version_file.read().strip()
 
 
-def modcc():
-    import os
-    import sys
-    import subprocess
-
-    sys.exit(
-        subprocess.call(
-            [os.path.join(os.path.dirname(__file__), "bin", "modcc"), *sys.argv[1:]]
-        )
-    )
-
-
-def build_catalogue():
-    import os
-    import sys
-    import subprocess
-
-    sys.exit(
-        subprocess.call(
-            [
-                os.path.join(os.path.dirname(__file__), "bin", "arbor-build-catalogue"),
-                *sys.argv[1:],
-            ]
-        )
-    )
-
-
 __version__ = get_version()
 __config__ = config()  # noqa:F405
 

python/modcc.py

@@ -0,0 +1,11 @@
+# NOTE this is a placeholder until we make pybind11 bindings for modcc
+def cli():
+    import os
+    import sys
+    import subprocess
+
+    sys.exit(
+        subprocess.call(
+            [os.path.join(os.path.dirname(__file__), "bin", "modcc"), *sys.argv[1:]]
+        )
+    )

python/strprintf.hpp

@@ -168,7 +168,7 @@ namespace impl {
             for (auto& x: s.seq_) {
                 if (!first) o << s.sep_;
                 first = false;
-                o << s.f(x);
+                o << s.f_(x);
             }
             return o;
         }

python/test/fixtures.py

@@ -6,6 +6,7 @@
 import subprocess
 import atexit
 import inspect
+from unittest import SkipTest
 
 _mpi_enabled = A.__config__["mpi"]
 _mpi4py_enabled = A.__config__["mpi4py"]
@@ -110,7 +111,7 @@ class _BuildCatError(Exception):
 
 def _build_cat_local(name, path):
     try:
-        subprocess.run(
+        p = subprocess.run(
             ["arbor-build-catalogue", name, str(path)],
             check=True,
             stderr=subprocess.PIPE,
@@ -155,7 +156,6 @@ def _build_cat(name, path, context):
                 "Building catalogue in an MPI context, but `mpi4py` not found."
                 " Concurrent identical catalogue builds might occur."
             ) from None
-
         _build_cat_distributed(comm, name, path)
     else:
         _build_cat_local(name, path)
@@ -169,9 +169,14 @@ def dummy_catalogue(repo_path):
     Fixture that returns a dummy `A.catalogue`
     which contains the `dummy` mech.
     """
-    path = repo_path / "test" / "unit" / "dummy"
-    cat_path = _build_cat("dummy", path)
-    return A.load_catalogue(str(cat_path))
+    try:
+        path = repo_path / "test" / "unit" / "dummy"
+        cat_path = _build_cat("dummy", path)
+        print(cat_path)
+        cat = A.load_catalogue(str(cat_path))
+    except Exception:
+        raise SkipTest("Couldn't build catalogue, maybe need to install Arbor first?")
+    return cat
 
 
 @_fixture