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

Move axl mpi to axl #501

Merged
merged 5 commits into from
Apr 4, 2022
Merged

Move axl mpi to axl #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09338c0
Ignore files created by dev environment
mcfadden8 Mar 29, 2022
715c51d
Move AXL MPI wrapper implementation to AXL library.
mcfadden8 Apr 1, 2022
b911160
Merge branch 'develop' into move-axl_mpi-to-axl
mcfadden8 Apr 4, 2022
e2527b0
Merge branch 'develop' into move-axl_mpi-to-axl
mcfadden8 Apr 4, 2022
b0597df
Moved axl_mpi to AXL and made new AXL_MPI lib
mcfadden8 Apr 4, 2022
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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,9 @@ doc/Makefile
examples/Makefile
examples/makefile.examples
man/Makefile

build
deps
install
python/scr.py
tags
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ INCLUDE(CheckIncludeFile)
FIND_PACKAGE(AXL REQUIRED)
IF(AXL_FOUND)
INCLUDE_DIRECTORIES(${AXL_INCLUDE_DIRS})
LIST(APPEND SCR_EXTERNAL_LIBS ${AXL_LIBRARIES})
LIST(APPEND SCR_EXTERNAL_LIBS ${AXL_MPI_LIBRARIES})
LIST(APPEND SCR_EXTERNAL_SERIAL_LIBS ${AXL_LIBRARIES})
LIST(APPEND SCR_LINK_LINE "-laxl")
LIST(APPEND SCR_LINK_LINE "-laxl_mpi")
ENDIF(AXL_FOUND)

## ER
Expand Down
1 change: 1 addition & 0 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ pushd AXL
cmake \
-DCMAKE_BUILD_TYPE=$buildtype \
-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
-DMPI=ON \
.. && \
make -j `nproc` && \
make install
Expand Down
6 changes: 6 additions & 0 deletions cmake/FindAXL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ FIND_LIBRARY(AXL_LIBRARIES
HINTS ${WITH_AXL_PREFIX}/lib
)

FIND_LIBRARY(AXL_MPI_LIBRARIES
NAMES axl_mpi
HINTS ${WITH_AXL_PREFIX}/lib
)

FIND_PATH(AXL_INCLUDE_DIRS
NAMES axl.h
HINTS ${WITH_AXL_PREFIX}/include
Expand All @@ -21,6 +26,7 @@ FIND_PATH(AXL_INCLUDE_DIRS
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(AXL DEFAULT_MSG
AXL_LIBRARIES
AXL_MPI_LIBRARIES
AXL_INCLUDE_DIRS
)

Expand Down
23 changes: 11 additions & 12 deletions dist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ LIST(APPEND libscr_srcs
scr/src/scr_summary.c
scr/src/scr_util.c
scr/src/scr_util_mpi.c
scr/src/axl_mpi.c
scr/src/scr_flush_nompi.c
)

Expand All @@ -199,20 +198,20 @@ ADD_LIBRARY(scr_o OBJECT
)

LIST(APPEND scr_tpl_objects
$<TARGET_OBJECTS:axl_o>
$<TARGET_OBJECTS:er_o>
$<TARGET_OBJECTS:kvtree_o>
$<TARGET_OBJECTS:rankstr_o>
$<TARGET_OBJECTS:redset_o>
$<TARGET_OBJECTS:shuffile_o>
$<TARGET_OBJECTS:spath_o>
$<TARGET_OBJECTS:axl_mpi_o>
$<TARGET_OBJECTS:er_o>
$<TARGET_OBJECTS:kvtree_o>
$<TARGET_OBJECTS:rankstr_o>
$<TARGET_OBJECTS:redset_o>
$<TARGET_OBJECTS:shuffile_o>
$<TARGET_OBJECTS:spath_o>
)

LIST(APPEND scr_tpl_noMPI_objects
$<TARGET_OBJECTS:axl_o>
$<TARGET_OBJECTS:kvtree_noMPI_o>
$<TARGET_OBJECTS:redset_noMPI_o>
$<TARGET_OBJECTS:spath_base_o>
$<TARGET_OBJECTS:axl_o>
$<TARGET_OBJECTS:kvtree_noMPI_o>
$<TARGET_OBJECTS:redset_noMPI_o>
$<TARGET_OBJECTS:spath_base_o>
)

# Install header files
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ LIST(APPEND libscr_srcs
scr_summary.c
scr_util.c
scr_util_mpi.c
axl_mpi.c
)

# SCR Library
Expand Down
301 changes: 0 additions & 301 deletions src/axl_mpi.c
View file
Open in desktop

This file was deleted.

Loading