Reorganize hoomd.version

glotzerlab · Jun 9, 2021 · 68b409f · 68b409f
1 parent fb2d30d
commit 68b409f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 34 deletions.
diff --git a/hoomd/version.py b/hoomd/version.py
@@ -45,27 +45,18 @@
 """
 from hoomd import _hoomd
 
-try:
-    import hoomd.version_config
-
-    compile_date = hoomd.version_config.compile_date
-    git_branch = hoomd.version_config.git_branch
-    git_sha1 = hoomd.version_config.git_sha1
-    md_built = hoomd.version_config.md_built
-    hpmc_built = hoomd.version_config.hpmc_built
-    dem_built = hoomd.version_config.dem_built
-    mpcd_built = hoomd.version_config.mpcd_built
-    metal_built = hoomd.version_config.metal_built
-except ImportError:
-    # Allow sphinx docs to build when missing CMake generated python files
-    compile_date = "n/a"
-    git_branch = "n/a"
-    git_sha1 = "n/a"
-    md_built = "n/a"
-    hpmc_built = "n/a"
-    dem_built = "n/a"
-    mpcd_built = "n/a"
-    metal_built = "n/a"
+from hoomd.version_config import (
+    compile_date,
+    git_branch,
+    git_sha1,
+    md_built,
+    hpmc_built,
+    dem_built,
+    mpcd_built,
+    metal_built,
+    cuda_include_path,
+    cuda_devrt_library,
+)
 
 version = _hoomd.BuildInfo.getVersion()
 compile_flags = _hoomd.BuildInfo.getCompileFlags()

diff --git a/hoomd/version_config.py.in b/hoomd/version_config.py.in
@@ -17,3 +17,7 @@ dem_built = ${_dem_built}
 mpcd_built = ${_mpcd_built}
 
 metal_built = ${_metal_built}
+
+cuda_include_path = "${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}"
+
+cuda_devrt_library = "${CUDA_cudadevrt_LIBRARY}"
diff --git a/sphinx-doc/conf.py b/sphinx-doc/conf.py
@@ -33,6 +33,7 @@
 
 autodoc_mock_imports = [
     'hoomd._hoomd',
+    'hoomd.version_config',
     'hoomd.md._md',
     'hoomd.metal._metal',
     'hoomd.mpcd._mpcd',

diff --git a/sphinx-doc/module-hoomd-version.rst b/sphinx-doc/module-hoomd-version.rst
@@ -5,16 +5,3 @@ hoomd.version
 
 .. automodule:: hoomd.version
     :synopsis: Version and build information.
-    :members: compile_date,
-              compile_flags,
-              cxx_compiler,
-              git_branch,
-              git_sha1,
-              gpu_api_version,
-              gpu_enabled,
-              gpu_platform,
-              install_dir,
-              mpi_enabled,
-              source_dir,
-              tbb_enabled,
-              version