Skip to content

Commit 820f218

Browse files
committed
change usage of nthreads to extern omp_number in parallel_global.h
temporally change it to check error in CI
1 parent dc2ecc5 commit 820f218

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

source/module_base/parallel_global.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void Parallel_Global::read_mpi_parameters(int argc, char** argv, int& NPROC, int
140140
#endif
141141
mpi_number = process_num;
142142
omp_number = current_thread_num;
143-
PARAM.globalv.nthread_per_proc = current_thread_num;
143+
// PARAM.globalv.nthread_per_proc = current_thread_num;
144144
if (current_thread_num * process_num > max_thread_num && local_rank == 0)
145145
{
146146
std::stringstream mess;

source/module_io/print_info.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "module_base/global_variable.h"
44
#include "module_parameter/parameter.h"
5+
#include "module_base/parallel_global.h"
56

67

78
namespace ModuleIO
@@ -91,7 +92,8 @@ void setup_parameters(UnitCell& ucell, K_Vectors& kv)
9192
}
9293

9394
std::cout << std::setw(12) << GlobalV::NPROC
94-
<< std::setw(12) << PARAM.globalv.nthread_per_proc * GlobalV::NPROC;
95+
<< std::setw(12) << Parallel_Global::omp_number * GlobalV::NPROC;
96+
// << std::setw(12) << PARAM.globalv.nthread_per_proc * GlobalV::NPROC;
9597
if (orbinfo) { std::cout << std::setw(12) << PARAM.globalv.nlocal; }
9698

9799
std::cout << std::endl;

0 commit comments

Comments
 (0)