Skip to content

Commit 5fc2ea1

Browse files
committed
remove unwanted changes
1 parent 0af106f commit 5fc2ea1

8 files changed

Lines changed: 13 additions & 10 deletions

include/gauxc/enums.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ enum class ExecutionSpace {
5151
Device ///< Execute task on the device (e.g. GPU)
5252
};
5353

54-
} // namespace GauXC
5554

55+
} // namespace GauXC

src/load_balancer/host/replicated_host_load_balancer.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ std::vector< XCTask > HostReplicatedLoadBalancer::create_local_tasks_() const {
8484
task.protonic_bfn_screening.nbe = protonic_nbe;
8585
}
8686

87-
8887
#pragma omp critical
8988
temp_tasks.push_back(
9089
std::pair(batch_idx,std::move( task ))

src/load_balancer/load_balancer_impl.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LoadBalancerImpl::LoadBalancerImpl(const RuntimeEnvironment& rt, const Molecule&
2828
std::shared_ptr<MolMeta> molmeta, size_t pv) :
2929
LoadBalancerImpl(rt, mol, mg, basis, molmeta, pv) {
3030

31-
// Unique initializations for the second basis
31+
// Unique initializations for the protonic basis
3232
protonic_basis_ = std::make_shared<basis_type>(protonic_basis);
3333
protonic_basis_map_ = std::make_shared<basis_map_type>(*protonic_basis_, mol);
3434
}

src/load_balancer/load_balancer_impl.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class LoadBalancerImpl {
2929
std::shared_ptr<MolMeta> molmeta_;
3030
std::shared_ptr<basis_map_type> basis_map_;
3131
std::shared_ptr<shell_pair_type> shell_pairs_;
32-
3332
// Protonic basis information if doing Nuclear-Electronic Orbital (NEO) theory
3433
std::shared_ptr<basis_type> protonic_basis_;
3534
std::shared_ptr<basis_map_type> protonic_basis_map_;

src/load_balancer/rebalance.cxx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ auto rebalance(TaskIterator begin, TaskIterator end, const CostFunctor& cost, MP
177177
mpi_buffer.pack(task.weights);
178178
mpi_buffer.pack(task.bfn_screening.shell_list);
179179
mpi_buffer.pack(task.bfn_screening.nbe);
180+
mpi_buffer.pack(task.protonic_bfn_screening.shell_list);
181+
mpi_buffer.pack(task.protonic_bfn_screening.nbe);
180182
mpi_buffer.pack(task.cou_screening.shell_list);
181183
mpi_buffer.pack(task.cou_screening.shell_pair_list);
182184
mpi_buffer.pack(task.cou_screening.shell_pair_idx_list);
@@ -296,6 +298,8 @@ auto rebalance(TaskIterator begin, TaskIterator end, const CostFunctor& cost, MP
296298
mpi_buffer.unpack(task.weights);
297299
mpi_buffer.unpack(task.bfn_screening.shell_list);
298300
mpi_buffer.unpack(task.bfn_screening.nbe);
301+
mpi_buffer.unpack(task.protonic_bfn_screening.shell_list);
302+
mpi_buffer.unpack(task.protonic_bfn_screening.nbe);
299303
mpi_buffer.unpack(task.cou_screening.shell_list);
300304
mpi_buffer.unpack(task.cou_screening.shell_pair_list);
301305
mpi_buffer.unpack(task.cou_screening.shell_pair_idx_list);

src/xc_integrator/replicated/host/reference_replicated_xc_host_integrator.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class ReferenceReplicatedXCHostIntegrator :
5454
value_type* VXCx, int64_t ldvxcx,
5555
value_type* EXC, const IntegratorSettingsXC& ks_settings ) override;
5656

57-
5857
void neo_eval_exc_vxc_( int64_t m1, int64_t n1, int64_t m2, int64_t n2,
5958
const value_type* Ps, int64_t ldps,
6059
const value_type* prot_Ps, int64_t prot_ldps,

src/xc_integrator/replicated/host/reference_replicated_xc_host_integrator_exc_vxc.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ void ReferenceReplicatedXCHostIntegrator<ValueType>::
191191
});
192192

193193

194-
}
195-
194+
}
195+
196+
197+
196198
template <typename ValueType>
197199
void ReferenceReplicatedXCHostIntegrator<ValueType>::
198200
exc_vxc_local_work_( const value_type* Ps, int64_t ldps,
@@ -665,7 +667,7 @@ void ReferenceReplicatedXCHostIntegrator<ValueType>::
665667
}
666668
}
667669

668-
}
670+
}
669671

670672
}
671673
}

src/xc_integrator/replicated/replicated_xc_integrator_impl.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void ReplicatedXCIntegratorImpl<ValueType>::
5050
int64_t ldpz,
5151
value_type* VXCs, int64_t ldvxcs,
5252
value_type* VXCz, int64_t ldvxcz,
53-
value_type* EXC, const IntegratorSettingsXC& ks_settings) {
53+
value_type* EXC, const IntegratorSettingsXC& ks_settings ) {
5454

5555
eval_exc_vxc_(m,n,Ps,ldps,
5656
Pz,ldpz,
@@ -96,7 +96,7 @@ void ReplicatedXCIntegratorImpl<ValueType>::
9696
value_type* prot_VXCs, int64_t prot_ldvxcs,
9797
value_type* prot_VXCz, int64_t prot_ldvxcz,
9898
value_type* elec_EXC, value_type* prot_EXC,
99-
const IntegratorSettingsXC& ks_settings){
99+
const IntegratorSettingsXC& ks_settings ){
100100

101101
neo_eval_exc_vxc_(elec_m,elec_n,prot_m,prot_n,
102102
elec_Ps, elec_ldps,

0 commit comments

Comments
 (0)