Skip to content

Dynamically Find Radex/SmartRedis Install Library Dir #4

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

Merged
MattToast merged 10 commits into from
Sep 1, 2026
Merged

Dynamically Find Radex/SmartRedis Install Library Dir #4

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be35688
Resolve library paths independent of `lib/64` preference
MattToast Aug 27, 2026
9255fff
Keep nearly identical files nearly identical
MattToast Aug 27, 2026
e0c122d
radexBase uses resolved paths
MattToast Aug 27, 2026
042c311
radexRead uses resolved paths
MattToast Aug 27, 2026
4844945
radexWrite uses resolved paths
MattToast Aug 27, 2026
006367d
radexIO uses resolved paths
MattToast Aug 27, 2026
0f12c8d
Greater `find_lib` compatibility
MattToast Sep 1, 2026
2670d04
Remove carriage return at end of new lines
MattToast Sep 1, 2026
09dbe25
Make dir a local variable
MattToast Sep 1, 2026
1e770cf
Keep nearly identical files nearly identical
MattToast Sep 1, 2026
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
45 changes: 43 additions & 2 deletions Allwmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,48 @@ then
: "${DRAGON_LIBS:=$dragon_libs}"
fi

export RADEX_DIR SMARTREDIS_DIR DRAGON_LIBS DRAGON_INCLUDES
find_lib_dir() {
local INSTALL_DIR="${1}"
local LIB_NAME="${2}"

local LIB_PATH="$(
find ${INSTALL_DIR} \
-maxdepth 2 \
-name ${LIB_NAME} \
-type f \
-print \
-quit \
)"

if [ -z "${LIB_PATH}" ]; then
local FALLBACK_PATH="${INSTALL_DIR}/lib"
printf \
"Failed to find library directory at install dir '%s'\n" \
"${INSTALL_DIR}" \
>&2
printf \
" Defaulting to '%s'\n" \
"${FALLBACK_PATH}" \
>&2
printf "${FALLBACK_PATH}\n"
return 1
fi

dirname "${LIB_PATH}"
return 0
}
Comment thread
MattToast marked this conversation as resolved.

RADEX_INCLUDE_DIR="${RADEX_DIR}/include"
RADEX_LIB_DIR="$(find_lib_dir ${RADEX_DIR} libradex.so)"
Comment thread
MattToast marked this conversation as resolved.
Outdated
SMARTREDIS_INCLUDE_DIR="${SMARTREDIS_DIR}/include"
SMARTREDIS_LIB_DIR="$(find_lib_dir ${SMARTREDIS_DIR} libsmartredis.so)"
Comment thread
MattToast marked this conversation as resolved.
Outdated

export DRAGON_INCLUDES \
DRAGON_LIBS \
RADEX_INCLUDE_DIR \
RADEX_LIB_DIR \
SMARTREDIS_INCLUDE_DIR \
SMARTREDIS_LIB_DIR

# Create the $FOAM_USER_LIBBIN if not existing.
# - This happens with a fresh OpenFOAM installation.
Expand Down Expand Up @@ -59,4 +100,4 @@ then
exit 1
fi

python3 -m pip install .
python3 -m pip install .
45 changes: 43 additions & 2 deletions src/openFOAM/Allwmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,48 @@ then
: "${DRAGON_LIBS:=$dragon_libs}"
fi

export RADEX_DIR SMARTREDIS_DIR DRAGON_LIBS DRAGON_INCLUDES
find_lib_dir() {
local INSTALL_DIR="${1}"
local LIB_NAME="${2}"

local LIB_PATH="$(
find ${INSTALL_DIR} \
-maxdepth 2 \
-name ${LIB_NAME} \
-type f \
-print \
-quit \
)"

if [ -z "${LIB_PATH}" ]; then
local FALLBACK_PATH="${INSTALL_DIR}/lib"
printf \
"Failed to find library directory at install dir '%s'\n" \
"${INSTALL_DIR}" \
>&2
printf \
" Defaulting to '%s'\n" \
"${FALLBACK_PATH}" \
>&2
printf "${FALLBACK_PATH}\n"
return 1
fi

dirname "${LIB_PATH}"
return 0
}

RADEX_INCLUDE_DIR="${RADEX_DIR}/include"
RADEX_LIB_DIR="$(find_lib_dir ${RADEX_DIR} libradex.so)"
SMARTREDIS_INCLUDE_DIR="${SMARTREDIS_DIR}/include"
SMARTREDIS_LIB_DIR="$(find_lib_dir ${SMARTREDIS_DIR} libsmartredis.so)"

export DRAGON_INCLUDES \
DRAGON_LIBS \
RADEX_INCLUDE_DIR \
RADEX_LIB_DIR \
SMARTREDIS_INCLUDE_DIR \
SMARTREDIS_LIB_DIR

# Create the $FOAM_USER_LIBBIN if not existing.
# - This happens with a fresh OpenFOAM installation.
Expand All @@ -40,4 +81,4 @@ fi
wmake libso radexIO
wmake libso functionObjects/radexBase
wmake libso functionObjects/radexWrite
wmake libso functionObjects/radexRead
wmake libso functionObjects/radexRead
16 changes: 9 additions & 7 deletions src/openFOAM/functionObjects/radexBase/Make/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
RADEX_DIR ?=
RADEX_INCLUDE_DIR ?=
RADEX_LIB_DIR ?=
DRAGON_LIBS ?=
DRAGON_INCLUDES ?=
SMARTREDIS_DIR ?=
SMARTREDIS_INCLUDE_DIR ?=
SMARTREDIS_LIB_DIR ?=

EXE_INC = \
-std=c++17 \
-I../../radexIO/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(RADEX_DIR)/include \
-I$(SMARTREDIS_DIR)/include \
-I$(RADEX_INCLUDE_DIR) \
-I$(SMARTREDIS_INCLUDE_DIR) \
$(DRAGON_INCLUDES)

LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lradexIO \
-L$(RADEX_DIR)/lib \
-L$(RADEX_LIB_DIR) \
-lradex \
-Wl,-rpath,$(RADEX_DIR)/lib \
-L$(SMARTREDIS_DIR)/lib \
-Wl,-rpath,$(RADEX_LIB_DIR) \
-L$(SMARTREDIS_LIB_DIR) \
-lsmartredis \
$(DRAGON_LIBS) \
-Wl,-rpath,/Users/ashao/dev/hpc-pe-dragon-dragon/src/dragon/lib
16 changes: 9 additions & 7 deletions src/openFOAM/functionObjects/radexRead/Make/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
RADEX_DIR ?=
RADEX_INCLUDE_DIR ?=
RADEX_LIB_DIR ?=
DRAGON_LIBS ?=
DRAGON_INCLUDES ?=
SMARTREDIS_DIR ?=
SMARTREDIS_INCLUDE_DIR ?=
SMARTREDIS_LIB_DIR ?=

EXE_INC = \
-std=c++17 \
-I../radexBase/lnInclude \
-I../../radexIO/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(RADEX_DIR)/include \
-I$(SMARTREDIS_DIR)/include \
-I$(RADEX_INCLUDE_DIR) \
-I$(SMARTREDIS_INCLUDE_DIR) \
$(DRAGON_INCLUDES)

LIB_LIBS = \
Expand All @@ -19,10 +21,10 @@ LIB_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lradexIO \
-lradexBase \
-L$(RADEX_DIR)/lib \
-L$(RADEX_LIB_DIR) \
-lradex \
-Wl,-rpath,$(RADEX_DIR)/lib \
-L$(SMARTREDIS_DIR)/lib \
-Wl,-rpath,$(RADEX_LIB_DIR) \
-L$(SMARTREDIS_LIB_DIR) \
-lsmartredis \
$(DRAGON_LIBS) \
-Wl,-rpath,/Users/ashao/dev/hpc-pe-dragon-dragon/src/dragon/lib
16 changes: 9 additions & 7 deletions src/openFOAM/functionObjects/radexWrite/Make/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
RADEX_DIR ?=
RADEX_INCLUDE_DIR ?=
RADEX_LIB_DIR ?=
DRAGON_LIBS ?=
DRAGON_INCLUDES ?=
SMARTREDIS_DIR ?=
SMARTREDIS_INCLUDE_DIR ?=
SMARTREDIS_LIB_DIR ?=

EXE_INC = \
-std=c++17 \
-I../radexBase/lnInclude \
-I../../radexIO/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(RADEX_DIR)/include \
-I$(SMARTREDIS_DIR)/include \
-I$(RADEX_INCLUDE_DIR) \
-I$(SMARTREDIS_INCLUDE_DIR) \
$(DRAGON_INCLUDES)

LIB_LIBS = \
Expand All @@ -19,10 +21,10 @@ LIB_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lradexIO \
-lradexBase \
-L$(RADEX_DIR)/lib \
-L$(RADEX_LIB_DIR) \
-lradex \
-Wl,-rpath,$(RADEX_DIR)/lib \
-L$(SMARTREDIS_DIR)/lib \
-Wl,-rpath,$(RADEX_LIB_DIR) \
-L$(SMARTREDIS_LIB_DIR) \
-lsmartredis \
$(DRAGON_LIBS) \
-Wl,-rpath,/Users/ashao/dev/hpc-pe-dragon-dragon/src/dragon/lib
16 changes: 9 additions & 7 deletions src/openFOAM/radexIO/Make/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
RADEX_DIR ?=
RADEX_INCLUDE_DIR ?=
RADEX_LIB_DIR ?=
DRAGON_LIBS ?=
DRAGON_INCLUDES ?=
SMARTREDIS_DIR ?=
SMARTREDIS_INCLUDE_DIR ?=
SMARTREDIS_LIB_DIR ?=

EXE_INC = \
-std=c++17 \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(RADEX_DIR)/include \
-I$(SMARTREDIS_DIR)/include \
-I$(RADEX_INCLUDE_DIR) \
-I$(SMARTREDIS_INCLUDE_DIR) \
$(DRAGON_INCLUDES)

LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(RADEX_DIR)/lib \
-L$(RADEX_LIB_DIR) \
-lradex \
-Wl,-rpath,$(RADEX_DIR)/lib \
-L$(SMARTREDIS_DIR)/lib \
-Wl,-rpath,$(RADEX_LIB_DIR) \
-L$(SMARTREDIS_LIB_DIR) \
-lsmartredis \
$(DRAGON_LIBS) \
-Wl,-rpath,/Users/ashao/dev/hpc-pe-dragon-dragon/src/dragon/lib