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

Fix issues with umpire in ascent_config.mk.in and dray_config.mk.in. #1463

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix issues with umpire in ascent_config.mk.in and dray_config.mk.in. #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f54e67
Change umpire lib dir to lib64. Fix Typo.
Feb 20, 2025
ae94ace
Change umpire lib dir to lib64. Fix typo.
Feb 20, 2025
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: 3 additions & 3 deletions src/config/ascent_config.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ else
endif

ASCENT_RAJA_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_RAJA_DIR)/lib
ASCENT_UMPIRE_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_UMPIRE_DIR)/lib
ASCENT_UMPIRE_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_UMPIRE_DIR)/lib64
ASCENT_CAMP_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_CAMP_DIR)/lib
ASCENT_OCCA_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_OCCA_DIR)/lib
ASCENT_VTKM_RPATH_FLAGS_VALUE = -Wl,-rpath,$(ASCENT_VTKM_DIR)/lib
Expand Down Expand Up @@ -212,12 +212,12 @@ ASCENT_RAJA_LIB_FLAGS = $(if $(ASCENT_RAJA_DIR),-L $(ASCENT_RAJA_DIR)/lib -lRAJA
##########
# UMPIRE
##########
ASCENT_UMPIRE_LIB_FLAGS = $(if $(ASCENT_UMPIRE_DIR),-L $(ASCENT_UMPIRE_DIR)/lib -lumpire)
ASCENT_UMPIRE_LIB_FLAGS = $(if $(ASCENT_UMPIRE_DIR),-L $(ASCENT_UMPIRE_DIR)/lib64 -lumpire)

##########
# CAMP
##########
ASCENT_UMPIRE_LIB_FLAGS = $(if $(ASCENT_CAMP_DIR),-L $(ASCENT_CAMP_DIR)/lib -lcamp)
ASCENT_CAMP_LIB_FLAGS = $(if $(ASCENT_CAMP_DIR),-L $(ASCENT_CAMP_DIR)/lib -lcamp)

##########
# OCCA
Expand Down
4 changes: 2 additions & 2 deletions src/config/dray_config.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DRAY_LINK_RPATH = -Wl,-rpath,$(DRAY_DIR)/lib $(CONDUIT_LINK_RPATH)
# two steps are used b/c there are commas in the linker commands
# which will undermine parsing of the makefile
DRAY_RAJA_RPATH_FLAGS_VALUE = -Wl,-rpath,$(DRAY_RAJA_DIR)/lib
DRAY_UMPIRE_RPATH_FLAGS_VALUE = -Wl,-rpath,$(DRAY_RAJA_DIR)/lib
DRAY_UMPIRE_RPATH_FLAGS_VALUE = -Wl,-rpath,$(DRAY_UMPIRE_DIR)/lib64
DRAY_MFEM_RPATH_FLAGS_VALUE = -Wl,-rpath,$(DRAY_MFEM_DIR)/lib

DRAY_LINK_RPATH += $(if $(DRAY_RAJA_DIR), $(DRAY_RAJA_RPATH_FLAGS_VALUE))
Expand All @@ -65,7 +65,7 @@ DRAY_CONDUIT_LIB_FLAGS = $(CONDUIT_LIB_FLAGS)
# UMPIRE
##########

DRAY_UMPIRE_LIB_FLAGS=-L $(DRAY_UMPIRE_DIR)/lib \
DRAY_UMPIRE_LIB_FLAGS=-L $(DRAY_UMPIRE_DIR)/lib64 \
-lumpire

##########
Expand Down
Loading