From 5ce1041e76635a780388fe22fd0f6d2cb815984f Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Wed, 11 Oct 2023 17:38:26 -0600 Subject: [PATCH] Small changes needed for Kokkos and Makefile build --- ML-PACE/ace/ace_b_evaluator.h | 6 +++--- yaml-cpp/Makefile | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 yaml-cpp/Makefile diff --git a/ML-PACE/ace/ace_b_evaluator.h b/ML-PACE/ace/ace_b_evaluator.h index 91c719a..b06dc22 100644 --- a/ML-PACE/ace/ace_b_evaluator.h +++ b/ML-PACE/ace/ace_b_evaluator.h @@ -44,9 +44,6 @@ class ACEBEvaluator : public ACEEvaluator { void init(ACEBBasisSet *basis_set); - // active sets - map> A_active_set_inv; - bool is_linear_extrapolation_grade = true; void resize_projections(); @@ -57,6 +54,9 @@ class ACEBEvaluator : public ACEEvaluator { public: + // active sets + map> A_active_set_inv; + ACEBEvaluator() = default; explicit ACEBEvaluator(ACEBBasisSet &bas) { diff --git a/yaml-cpp/Makefile b/yaml-cpp/Makefile new file mode 100644 index 0000000..73ed5a9 --- /dev/null +++ b/yaml-cpp/Makefile @@ -0,0 +1,39 @@ +SHELL = /bin/sh + +# ------ FILES ------ + +SRC = $(wildcard src/*.cpp) + + +# ------ DEFINITIONS ------ + +LIB = libyaml-cpp.a +OBJ = $(SRC:.cpp=.o) + + +# ------ SETTINGS ------ +CXXFLAGS = -O3 -fPIC -Iinclude + +ARCHIVE = ar +ARCHFLAG = -rc +USRLIB = +SYSLIB = + +# ------ MAKE PROCEDURE ------ + +lib: $(OBJ) + $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + +# ------ COMPILE RULES ------ + +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + +# ------ CLEAN ------ +clean: clean-all + +clean-all: + -rm -f *~ $(OBJ) $(LIB) + +clean-build: + -rm -f *~ $(OBJ)