@@ -79,12 +79,12 @@ TEST_F(AXTest, DoubleSerial)
7979 std::vector<container::Tensor> V (s.nks , container::Tensor (DAT::DT_DOUBLE, DEV::CpuDevice, { s.naos , s.naos }));
8080 set_rand (&c (0 , 0 , 0 ), size_c);
8181 for (auto & v : V) { set_rand (v.data <double >(), size_v); }
82- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &vo_for (istate, 0 , 0 ));
83- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &vo_blas (istate, 0 , 0 ), false );
84- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &oo_for (istate, 0 , 0 ), LR::MO_TYPE::OO);
85- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &oo_blas (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
86- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &vv_for (istate, 0 , 0 ), LR::MO_TYPE::VV);
87- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &vv_blas (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
82+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &vo_for (istate, 0 , 0 ));
83+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &vo_blas (istate, 0 , 0 ), false );
84+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &oo_for (istate, 0 , 0 ), LR::MO_TYPE::OO);
85+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &oo_blas (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
86+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &vv_for (istate, 0 , 0 ), LR::MO_TYPE::VV);
87+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &vv_blas (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
8888 }
8989 check_eq (&vo_for (0 , 0 , 0 ), &vo_blas (0 , 0 , 0 ), nstate * s.nks * s.nocc * s.nvirt );
9090 check_eq (&oo_for (0 , 0 , 0 ), &oo_blas (0 , 0 , 0 ), nstate * s.nks * s.nocc * s.nocc );
@@ -111,12 +111,12 @@ TEST_F(AXTest, ComplexSerial)
111111 std::vector<container::Tensor> V (s.nks , container::Tensor (DAT::DT_COMPLEX_DOUBLE, DEV::CpuDevice, { s.naos , s.naos }));
112112 set_rand (&c (0 , 0 , 0 ), size_c);
113113 for (auto & v : V) { set_rand (v.data <std::complex <double >>(), size_v); }
114- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &vo_for (istate, 0 , 0 ));
115- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &vo_blas (istate, 0 , 0 ), false );
116- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &oo_for (istate, 0 , 0 ), LR::MO_TYPE::OO);
117- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &oo_blas (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
118- LR::cal_AX_forloop_serial (V, c, s.nocc , s.nvirt , &vv_for (istate, 0 , 0 ), LR::MO_TYPE::VV);
119- LR::cal_AX_blas (V, c, s.nocc , s.nvirt , &vv_blas (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
114+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &vo_for (istate, 0 , 0 ));
115+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &vo_blas (istate, 0 , 0 ), false );
116+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &oo_for (istate, 0 , 0 ), LR::MO_TYPE::OO);
117+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &oo_blas (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
118+ LR::ao_to_mo_forloop_serial (V, c, s.nocc , s.nvirt , &vv_for (istate, 0 , 0 ), LR::MO_TYPE::VV);
119+ LR::ao_to_mo_blas (V, c, s.nocc , s.nvirt , &vv_blas (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
120120 }
121121 check_eq (&vo_for (0 , 0 , 0 ), &vo_blas (0 , 0 , 0 ), nstate * s.nks * s.nocc * s.nvirt );
122122 check_eq (&oo_for (0 , 0 , 0 ), &oo_blas (0 , 0 , 0 ), nstate * s.nks * s.nocc * s.nocc );
@@ -161,9 +161,9 @@ TEST_F(AXTest, DoubleParallel)
161161 set_rand (V.at (isk).data <double >(), pV.get_local_size ());
162162 set_rand (&c (isk, 0 , 0 ), pc.get_local_size ());
163163 }
164- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvo, &vo_pblas_loc (istate, 0 , 0 ), false );
165- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , poo, &oo_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
166- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvv, &vv_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
164+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvo, &vo_pblas_loc (istate, 0 , 0 ), false );
165+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , poo, &oo_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
166+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvv, &vv_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
167167 // gather AX and output
168168 for (int isk = 0 ;isk < s.nks ;++isk)
169169 {
@@ -183,13 +183,13 @@ TEST_F(AXTest, DoubleParallel)
183183 if (my_rank == 0 )
184184 {
185185 psi::Psi<double > vo_full_istate (s.nks , 1 , s.nocc * s.nvirt , nullptr , false );
186- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nvirt , &vo_full_istate (0 , 0 , 0 ), false );
186+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nvirt , &vo_full_istate (0 , 0 , 0 ), false );
187187 check_eq (&vo_full_istate (0 , 0 , 0 ), &vo_gather (istate, 0 , 0 ), s.nks * s.nocc * s.nvirt );
188188 psi::Psi<double > oo_full_istate (s.nks , 1 , s.nocc * s.nocc , nullptr , false );
189- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nvirt , &oo_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::OO);
189+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nvirt , &oo_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::OO);
190190 check_eq (&oo_full_istate (0 , 0 , 0 ), &oo_gather (istate, 0 , 0 ), s.nks * s.nocc * s.nocc );
191191 psi::Psi<double > vv_full_istate (s.nks , 1 , s.nvirt * s.nvirt , nullptr , false );
192- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nvirt , &vv_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::VV);
192+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nvirt , &vv_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::VV);
193193 check_eq (&vv_full_istate (0 , 0 , 0 ), &vv_gather (istate, 0 , 0 ), s.nks * s.nvirt * s.nvirt );
194194 }
195195 }
@@ -227,9 +227,9 @@ TEST_F(AXTest, ComplexParallel)
227227 set_rand (V.at (isk).data <std::complex <double >>(), pV.get_local_size ());
228228 set_rand (&c (isk, 0 , 0 ), pc.get_local_size ());
229229 }
230- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvo, &vo_pblas_loc (istate, 0 , 0 ), false );
231- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , poo, &oo_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
232- LR::cal_AX_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvv, &vv_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
230+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvo, &vo_pblas_loc (istate, 0 , 0 ), false );
231+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , poo, &oo_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::OO);
232+ LR::ao_to_mo_pblas (V, pV, c, pc, s.naos , s.nocc , s.nvirt , pvv, &vv_pblas_loc (istate, 0 , 0 ), false , LR::MO_TYPE::VV);
233233
234234 // gather AX and output
235235 for (int isk = 0 ;isk < s.nks ;++isk)
@@ -250,13 +250,13 @@ TEST_F(AXTest, ComplexParallel)
250250 if (my_rank == 0 )
251251 {
252252 psi::Psi<std::complex <double >> vo_full_istate (s.nks , 1 , s.nocc * s.nvirt , nullptr , false );
253- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nvirt , &vo_full_istate (0 , 0 , 0 ), false );
253+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nvirt , &vo_full_istate (0 , 0 , 0 ), false );
254254 check_eq (&vo_full_istate (0 , 0 , 0 ), &vo_gather (istate, 0 , 0 ), s.nks * s.nocc * s.nvirt );
255255 psi::Psi<std::complex <double >> oo_full_istate (s.nks , 1 , s.nocc * s.nocc , nullptr , false );
256- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nocc , &oo_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::OO);
256+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nocc , &oo_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::OO);
257257 check_eq (&oo_full_istate (0 , 0 , 0 ), &oo_gather (istate, 0 , 0 ), s.nks * s.nocc * s.nocc );
258258 psi::Psi<std::complex <double >> vv_full_istate (s.nks , 1 , s.nvirt * s.nvirt , nullptr , false );
259- LR::cal_AX_blas (V_full, c_full, s.nocc , s.nvirt , &vv_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::VV);
259+ LR::ao_to_mo_blas (V_full, c_full, s.nocc , s.nvirt , &vv_full_istate (0 , 0 , 0 ), false , LR::MO_TYPE::VV);
260260 check_eq (&vv_full_istate (0 , 0 , 0 ), &vv_gather (istate, 0 , 0 ), s.nks * s.nvirt * s.nvirt );
261261 }
262262 }
0 commit comments