Skip to content

fixes for path issues #384

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.

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
merged 2 commits into from
Apr 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions script/benchmark-program/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ def preprocess(i):
if env.get('MLC_RUN_DIR', '') == '':
env['MLC_RUN_DIR'] = os.getcwd()

env['MLC_RUN_CMD'] = MLC_RUN_PREFIX + ' ' + os.path.join(
env['MLC_RUN_DIR'], env['MLC_BIN_NAME']) + ' ' + env['MLC_RUN_SUFFIX']
env['MLC_RUN_CMD'] = f"""{MLC_RUN_PREFIX} {q}{os.path.join(env['MLC_RUN_DIR'], env['MLC_BIN_NAME'])}{q} {env['MLC_RUN_SUFFIX']}"""

x = env.get('MLC_RUN_PREFIX0', '')
if x != '':
Expand Down
8 changes: 4 additions & 4 deletions script/compile-program/run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ echo.
echo Compiling source files ...
echo.

if not exist %RUN_DIR% mkdir %RUN_DIR%
if not exist "%RUN_DIR%" mkdir "%RUN_DIR%"

cd %MLC_SOURCE_FOLDER_PATH%
cd "%MLC_SOURCE_FOLDER_PATH%"
IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%

if not "%MLC_C_SOURCE_FILES%" == "" (
echo %MLC_C_COMPILER_WITH_PATH% %MLC_C_COMPILER_FLAGS% %MLC_C_INCLUDE_PATH% %MLC_C_SOURCE_FILES% %MLC_LD_LIBRARY_PATH% %LDCFLAGS% %MLC_C_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
"%MLC_C_COMPILER_WITH_PATH%" %MLC_C_COMPILER_FLAGS% %MLC_C_INCLUDE_PATH% %MLC_C_SOURCE_FILES% %MLC_LD_LIBRARY_PATH% %LDCFLAGS% %MLC_C_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
"%MLC_C_COMPILER_WITH_PATH%" %MLC_C_COMPILER_FLAGS% "%MLC_C_INCLUDE_PATH%" %MLC_C_SOURCE_FILES% "%MLC_LD_LIBRARY_PATH%" %LDCFLAGS% %MLC_C_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
)

if not "%MLC_CXX_SOURCE_FILES%" == "" (
echo %MLC_CXX_COMPILER_WITH_PATH% %MLC_CXX_SOURCE_FILES% %MLC_CXX_COMPILER_FLAGS% %MLC_CPLUS_INCLUDE_PATH% %MLC_LD_LIBRARY_PATH% %LDCXXFLAGS% %MLC_CXX_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
"%MLC_CXX_COMPILER_WITH_PATH%" %MLC_CXX_SOURCE_FILES% %MLC_CXX_COMPILER_FLAGS% %MLC_CPLUS_INCLUDE_PATH% %MLC_LD_LIBRARY_PATH% %LDCXXFLAGS% %MLC_CXX_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
"%MLC_CXX_COMPILER_WITH_PATH%" %MLC_CXX_SOURCE_FILES% %MLC_CXX_COMPILER_FLAGS% "%MLC_CPLUS_INCLUDE_PATH%" "%MLC_LD_LIBRARY_PATH%" %LDCXXFLAGS% %MLC_CXX_COMPILER_FLAG_OUTPUT%"%RUN_DIR%\%BIN_NAME%"
IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
)

10 changes: 5 additions & 5 deletions script/compile-program/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# Compile

BIN_NAME=${MLC_BIN_NAME:-run.out}
RUN_DIR=${MLC_RUN_DIR:-.}
RUN_DIR="${MLC_RUN_DIR:-.}"
echo "RUN_DIR=$RUN_DIR"

if [[ ${MLC_SKIP_RECOMPILE} == "yes" ]]; then
if [ -f ${RUN_DIR}/${BIN_NAME} ]; then
if [ -f "${RUN_DIR}/${BIN_NAME}" ]; then
exit 0
fi
fi

rm -f ${RUN_DIR}/${BIN_NAME}
rm -f "${RUN_DIR}/${BIN_NAME}"

if [ -z "${MLC_SOURCE_FOLDER_PATH}" ]; then
echo "No source directory (MLC_SOURCE_FOLDER_PATH} specified"
Expand All @@ -28,13 +28,13 @@ echo ""
echo "Checking compiler version ..."
echo ""

${MLC_C_COMPILER_WITH_PATH} ${MLC_C_COMPILER_FLAG_VERSION}
"${MLC_C_COMPILER_WITH_PATH}" ${MLC_C_COMPILER_FLAG_VERSION}

echo ""
echo "Compiling source files ..."
echo ""

cd ${MLC_SOURCE_FOLDER_PATH}
cd "${MLC_SOURCE_FOLDER_PATH}"
test $? -eq 0 || exit 1

IFS=';' read -ra FILES <<< "${MLC_C_SOURCE_FILES}"
Expand Down
10 changes: 5 additions & 5 deletions script/extract-file/run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ if exist "%MLC_EXTRACT_EXTRACTED_FILENAME%" (

echo.
echo %MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%
cmd /c %MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%
cmd /c "%MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%"
IF !ERRORLEVEL! NEQ 0 (
set require_extract=1
del /Q %MLC_EXTRACT_EXTRACTED_FILENAME%
del /Q "%MLC_EXTRACT_EXTRACTED_FILENAME%"
)
)

if "!require_extract!" == "1" (
if not "%MLC_EXTRACT_CMD0%" == "" (
echo.
echo %MLC_EXTRACT_CMD0%
cmd /c %MLC_EXTRACT_CMD0%
cmd /c "%MLC_EXTRACT_CMD0%"
IF !ERRORLEVEL! NEQ 0 EXIT 1
)

echo.
echo %MLC_EXTRACT_CMD%
cmd /c %MLC_EXTRACT_CMD%
cmd /c "%MLC_EXTRACT_CMD%"
IF !ERRORLEVEL! NEQ 0 EXIT 1

echo.
echo %MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%
cmd /c %MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%
cmd /c "%MLC_EXTRACT_EXTRACTED_CHECKSUM_CMD%"
IF !ERRORLEVEL! NEQ 0 EXIT 1
)
2 changes: 1 addition & 1 deletion script/get-preprocessed-dataset-criteo/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def preprocess(i):
"recommendation_v2",
"torchrec_dlrm",
"scripts")
env['MLC_RUN_CMD'] = f'cd {run_dir} && bash ./process_Criteo_1TB_Click_Logs_dataset.sh {dataset_path} {tmp_dir} {output_dir} '
env['MLC_RUN_CMD'] = f"""cd '{run_dir}' && bash ./process_Criteo_1TB_Click_Logs_dataset.sh '{dataset_path}' '{tmp_dir}' '{output_dir}' """

print("Using MLCommons Training source from '" +
env['MLC_MLPERF_TRAINING_SOURCE'] + "'")
Expand Down
10 changes: 5 additions & 5 deletions script/get-preprocessed-dataset-criteo/preprocess_multihot.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
cd ${MLC_MLPERF_TRAINING_SOURCE}/recommendation_v2_torchrec_dlrm/
${MLC_PYTHON_BIN_WITH_PATH} materialize_synthetic_multihot_dataset.py \
--in_memory_binary_criteo_path $PREPROCESSED_CRITEO_1TB_CLICK_LOGS_DATASET_PATH \
--output_path $MATERIALIZED_DATASET_PATH \
cd "${MLC_MLPERF_TRAINING_SOURCE}/recommendation_v2_torchrec_dlrm/"
"${MLC_PYTHON_BIN_WITH_PATH}" "materialize_synthetic_multihot_dataset.py \
--in_memory_binary_criteo_path ${PREPROCESSED_CRITEO_1TB_CLICK_LOGS_DATASET_PATH} \
--output_path ${MATERIALIZED_DATASET_PATH} \
--num_embeddings_per_feature 40000000,39060,17295,7424,20265,3,7122,1543,63,40000000,3067956,405282,10,2209,11938,155,4,976,14,40000000,40000000,40000000,590152,12973,108,36 \
--multi_hot_sizes 3,2,1,2,6,1,1,1,1,7,3,8,1,6,9,5,1,1,1,12,100,27,10,3,1,1 \
--multi_hot_distribution_type uniform
--multi_hot_distribution_type uniform"
test $? -eq 0 || exit $?
Loading