From 13ede4a7356e3016fa8f16fb80fdbb1353eee46d Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Wed, 1 Dec 2021 18:00:38 +0000
Subject: [PATCH] Add Spack recipe
---
.gitignore | 3 ++-
.gitlab-ci.yml | 21 +++++++++++++++
.spack/repo/packages/csg-eb/package.py | 37 ++++++++++++++++++++++++++
.spack/repo/repo.yaml | 2 ++
CMakeLists.txt | 25 ++++++++++++++++-
Dockerfile | 6 ++++-
README.md | 14 ++++++++++
7 files changed, 105 insertions(+), 3 deletions(-)
create mode 100644 .spack/repo/packages/csg-eb/package.py
create mode 100644 .spack/repo/repo.yaml
diff --git a/.gitignore b/.gitignore
index c795b05..ce8c7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-build
\ No newline at end of file
+__pycache__
+build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c96047..e0b4c5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,3 +48,24 @@ test:no_cgal:
variables:
ENABLE_CSG: "OFF"
<<: *cmake_def
+
+.test:spack: &spack_def
+ stage: test
+ image: $CI_REGISTRY_IMAGE:latest
+ needs: ['build-img']
+ when: manual
+ script:
+ - /usr/local/spack/bin/spack repo add .spack/repo
+ - /usr/local/spack/bin/spack install csg-eb ${NO_CSG}
+ tags:
+ - docker
+
+spack:cgal:
+ variables:
+ NO_CSG: ""
+ <<: *spack_def
+
+spack:no_cgal:
+ variables:
+ NO_CSG: "~cgal"
+ <<: *spack_def
diff --git a/.spack/repo/packages/csg-eb/package.py b/.spack/repo/packages/csg-eb/package.py
new file mode 100644
index 0000000..5667497
--- /dev/null
+++ b/.spack/repo/packages/csg-eb/package.py
@@ -0,0 +1,37 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+CSG_REPO = "https://mfix.netl.doe.gov/gitlab/exa/csg-eb.git"
+CSG_BRANCH = "main"
+
+
+class CsgEb(CMakePackage):
+ """Define Embedded Boundaries (for AMReX) using CSG"""
+
+ homepage = "https://mfix.netl.doe.gov/gitlab/exa/csg-eb"
+
+ version("main", git=CSG_REPO, branch=CSG_BRANCH)
+
+ variant("cgal", default=True, description="Build with CGAL Support")
+
+ depends_on("pegtl")
+ depends_on("catch2")
+ depends_on("cgal", when="+cgal")
+
+ def cmake_args(self):
+ return [
+ "-DCSG_CGAL_ENABLED={}".format("True" if "+cgal" in self.spec else "False")
+ ]
+
+ def setup_run_environment(self, env):
+ env.prepend_path("CPATH", self.prefix.include)
+
+ @property
+ def headers(self):
+ headers = find_all_headers(self.prefix.include)
+ headers.directories = [self.prefix.include]
+ return headers
diff --git a/.spack/repo/repo.yaml b/.spack/repo/repo.yaml
new file mode 100644
index 0000000..007d87a
--- /dev/null
+++ b/.spack/repo/repo.yaml
@@ -0,0 +1,2 @@
+repo:
+ namespace: 'csg-eb-ns'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f8f7ea..e845572 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,12 +28,35 @@ endif()
add_subdirectory(src/csg)
target_include_directories(csg-eb
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+ PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
)
target_compile_features(csg-eb PRIVATE cxx_std_17)
+
+file(GLOB headers "include/*.hpp")
+install(FILES ${headers}
+ DESTINATION include
+ )
+
+install(TARGETS csg-eb
+ EXPORT CsgEbConfig
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+export(TARGETS csg-eb
+ NAMESPACE CsgEb::
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/CsgEbConfig.cmake"
+)
+install(EXPORT CsgEbConfig
+ DESTINATION "${CMAKE_INSTALL_PREFIX}"
+ NAMESPACE CsgEb::
+)
+
+
if (CSG_CGAL_ENABLED)
target_compile_definitions(csg-eb PUBLIC USE_CGAL)
endif()
diff --git a/Dockerfile b/Dockerfile
index 54085ae..7266b82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,10 @@ RUN apt-get -qq update \
&& pip3 install --no-cache-dir \
cmake==3.* \
conan==1.* \
- ninja==1.*
+ ninja==1.* \
+
+ && git clone -c feature.manyFiles=true https://github.com/spack/spack.git /usr/local/spack \
+
+ && PATH=/usr/local/spack/bin:$PATH
CMD [ "/bin/bash" ]
diff --git a/README.md b/README.md
index c42764c..3edf3e2 100644
--- a/README.md
+++ b/README.md
@@ -89,3 +89,17 @@ add_subdirectory(/path/to/repo/csg-eb)
```cmake
target_link_libraries(<target> PRIVATE csg)
```
+
+## Install with Spack
+
+Another way to install csg-eb is with Spack. See the [Spack documentation](https://spack.readthedocs.io) for instructions on how to install Spack.
+
+
+Then define a recipe for csg-eb:
+``` shell
+spack repo add .spack/repo # add repo with csg-eb recipe
+spack spec csg-eb # preview install
+spack install csg-eb # install csg-eb (with CGAL support)
+spack install csg-eb ~cgal # install csg-eb (without CGAL support)
+spack load csg-eb # Adds directory with libcsg-eb.a to LD_LIBRARY_PATH
+```
--
GitLab