Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: simplified Parallel_2d interface #4237

Merged
merged 12 commits into from
May 30, 2024
Merged

Refactor: simplified Parallel_2d interface #4237

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fcd9386
clean up
jinzx10 May 24, 2024
4c90a08
change to new interface
jinzx10 May 25, 2024
ea30741
fix missing header
jinzx10 May 25, 2024
c93aea9
Merge branch 'deepmodeling:develop' into parallel_2d_cleanup_stage2
jinzx10 May 25, 2024
e53973c
add missing header
jinzx10 May 25, 2024
bcacb4a
add missing header
jinzx10 May 25, 2024
2da945a
follow advice from review
jinzx10 May 27, 2024
4c6a123
Merge branch 'develop' into parallel_2d_cleanup_stage2
jinzx10 May 27, 2024
6616ac3
update BLACS test
jinzx10 May 28, 2024
3f66f2a
Merge branch 'develop' into parallel_2d_cleanup_stage2
jinzx10 May 28, 2024
abc15a4
compromise to pyabacus compilation
jinzx10 May 28, 2024
42dd325
Merge branch 'parallel_2d_cleanup_stage2' of github.com:jinzx10/abacu…
jinzx10 May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
compromise to pyabacus compilation
@jinzx10
jinzx10 committed May 28, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit abc15a4dcba6b4c44e584d38ff9cf34403fc360e
10 changes: 6 additions & 4 deletions source/module_base/blacs_connector.h
View file
Original file line number Diff line number Diff line change
@@ -29,9 +29,6 @@
#ifndef BLACS_CONNECTOR_H
#define BLACS_CONNECTOR_H

#ifdef __MPI
#include <mpi.h>

extern "C"
{
void Cblacs_pinfo(int *myid, int *nprocs);
@@ -44,9 +41,14 @@ extern "C"
int Cblacs_pnum(int icontxt, int prow, int pcol);
void Cblacs_pcoord(int icontxt, int pnum, int *prow, int *pcol);
void Cblacs_exit(int icontxt);
int Csys2blacs_handle(MPI_Comm SysCtxt);
}

#ifdef __MPI
#include <mpi.h>
extern "C"
{
int Csys2blacs_handle(MPI_Comm SysCtxt);
}
#endif // __MPI

#endif