Skip to content

Commit cb89c05

Browse files
committed
gha after fixing features
1 parent c9c26eb commit cb89c05

File tree

4 files changed

+75
-5
lines changed

4 files changed

+75
-5
lines changed

cmake/libint2-config.cmake.in

+65
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,71 @@ set (_valid_components
9595
eri_c4_d1_l8
9696
eri_c4_d1_l9
9797
eri_c4_d1_l10
98+
eri_c4_d2_l2
99+
eri_c4_d2_l3
100+
eri_c4_d2_l4
101+
eri_c4_d2_l5
102+
eri_c4_d2_l6
103+
eri_c4_d2_l7
104+
eri_c4_d2_l8
105+
eri_c4_d2_l9
106+
eri_c4_d2_l10
107+
108+
eri_c3_d0_l2
109+
eri_c3_d0_l3
110+
eri_c3_d0_l4
111+
eri_c3_d0_l5
112+
eri_c3_d0_l6
113+
eri_c3_d0_l7
114+
eri_c3_d0_l8
115+
eri_c3_d0_l9
116+
eri_c3_d0_l10
117+
eri_c3_d1_l2
118+
eri_c3_d1_l3
119+
eri_c3_d1_l4
120+
eri_c3_d1_l5
121+
eri_c3_d1_l6
122+
eri_c3_d1_l7
123+
eri_c3_d1_l8
124+
eri_c3_d1_l9
125+
eri_c3_d1_l10
126+
eri_c3_d2_l2
127+
eri_c3_d2_l3
128+
eri_c3_d2_l4
129+
eri_c3_d2_l5
130+
eri_c3_d2_l6
131+
eri_c3_d2_l7
132+
eri_c3_d2_l8
133+
eri_c3_d2_l9
134+
eri_c3_d2_l10
135+
136+
eri_c2_d0_l2
137+
eri_c2_d0_l3
138+
eri_c2_d0_l4
139+
eri_c2_d0_l5
140+
eri_c2_d0_l6
141+
eri_c2_d0_l7
142+
eri_c2_d0_l8
143+
eri_c2_d0_l9
144+
eri_c2_d0_l10
145+
eri_c2_d1_l2
146+
eri_c2_d1_l3
147+
eri_c2_d1_l4
148+
eri_c2_d1_l5
149+
eri_c2_d1_l6
150+
eri_c2_d1_l7
151+
eri_c2_d1_l8
152+
eri_c2_d1_l9
153+
eri_c2_d1_l10
154+
eri_c2_d2_l2
155+
eri_c2_d2_l3
156+
eri_c2_d2_l4
157+
eri_c2_d2_l5
158+
eri_c2_d2_l6
159+
eri_c2_d2_l7
160+
eri_c2_d2_l8
161+
eri_c2_d2_l9
162+
eri_c2_d2_l10
98163

99164
ss
100165
so

cmake/modules/int_am.cmake

+7-3
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,13 @@ process_integrals_class(G12DKH)
246246
# form list of active <class>_<deriv><max_am> strings to use in Libint2Config
247247
set(Libint2_ERI_COMPONENTS "")
248248
foreach(_cls ERI;ERI3;ERI2)
249-
# todo use eri4_d0_l2 or eri_c4_d0_l2
250-
string(TOLOWER ${_cls} _lbl)
251-
#set(_lbl "${_lbl}_")
249+
if (_cls STREQUAL "ERI")
250+
set(_lbl "eri_c4")
251+
elseif (_cls STREQUAL "ERI3")
252+
set(_lbl "eri_c3")
253+
elseif (_cls STREQUAL "ERI2")
254+
set(_lbl "eri_c2")
255+
endif()
252256

253257
if (INCLUDE_${_cls} GREATER -1)
254258
foreach (_d RANGE 0 ${INCLUDE_${_cls}})

cmake/modules/int_computed.cmake.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ set(LIBINT2_SHELL_SET "@LIBINT2_SHELL_SET@")
4747
# <<< AM Components >>>
4848

4949
set(Libint2_ERI_COMPONENTS "@Libint2_ERI_COMPONENTS@")
50-
set(Libint2_MAX_AM_ERI "@_candidate_ERI_E@")
50+
set(Libint2_MAX_AM_ERI "@_candidate_ERI_d0@") # for CMake config file
51+
set(Libint2_ERI_MAX_AM "@_candidate_ERI_d0@") # for features file

src/lib/libint/features.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LIBINT_SUPPORTS_ONEBODY = @LIBINT_SUPPORTS_ONEBODY@
22
LIBINT_ONEBODY_DERIV = @LIBINT_ONEBODY_DERIV@
33
LIBINT_SUPPORTS_ERI = @LIBINT_SUPPORTS_ERI@
4-
LIBINT_ERI_MAX_AM = @ERI_MAX_AM@
4+
LIBINT_ERI_MAX_AM = @Libint2_ERI_MAX_AM@
55
LIBINT_ERI_DERIV = @LIBINT_ERI_DERIV@
66
LIBINT_CONTRACTED_INTS = @LIBINT_CONTRACTED_INTS@
77
LIBINT_SHELL_SET = @LIBINT_SHELL_SET@

0 commit comments

Comments
 (0)