Skip to content

Commit 2b18cf9

Browse files
Merge pull request #19 from stanmoore1/kk_fixes
Small changes needed for Kokkos and Makefile build
2 parents 7ae1ec5 + 5ce1041 commit 2b18cf9

File tree

2 files changed

+42
-3
lines changed

2 files changed

+42
-3
lines changed

ML-PACE/ace/ace_b_evaluator.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ class ACEBEvaluator : public ACEEvaluator {
4444

4545
void init(ACEBBasisSet *basis_set);
4646

47-
// active sets
48-
map<SPECIES_TYPE, Array2D<DOUBLE_TYPE>> A_active_set_inv;
49-
5047
bool is_linear_extrapolation_grade = true;
5148

5249
void resize_projections();
@@ -57,6 +54,9 @@ class ACEBEvaluator : public ACEEvaluator {
5754

5855
public:
5956

57+
// active sets
58+
map<SPECIES_TYPE, Array2D<DOUBLE_TYPE>> A_active_set_inv;
59+
6060
ACEBEvaluator() = default;
6161

6262
explicit ACEBEvaluator(ACEBBasisSet &bas) {

yaml-cpp/Makefile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
SHELL = /bin/sh
2+
3+
# ------ FILES ------
4+
5+
SRC = $(wildcard src/*.cpp)
6+
7+
8+
# ------ DEFINITIONS ------
9+
10+
LIB = libyaml-cpp.a
11+
OBJ = $(SRC:.cpp=.o)
12+
13+
14+
# ------ SETTINGS ------
15+
CXXFLAGS = -O3 -fPIC -Iinclude
16+
17+
ARCHIVE = ar
18+
ARCHFLAG = -rc
19+
USRLIB =
20+
SYSLIB =
21+
22+
# ------ MAKE PROCEDURE ------
23+
24+
lib: $(OBJ)
25+
$(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ)
26+
27+
# ------ COMPILE RULES ------
28+
29+
%.o: %.cpp
30+
$(CXX) $(CXXFLAGS) -c $< -o $@
31+
32+
# ------ CLEAN ------
33+
clean: clean-all
34+
35+
clean-all:
36+
-rm -f *~ $(OBJ) $(LIB)
37+
38+
clean-build:
39+
-rm -f *~ $(OBJ)

0 commit comments

Comments
 (0)