Update buildbot scripts.

This commit is contained in:
Doru Bercea 2019-12-19 16:28:53 -05:00
parent f086948347
commit b5a35c9138
2 changed files with 22 additions and 22 deletions

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# Check for required env variables DLC_DEP_DIR, LLVM_PROJECT_ROOT # Check for required env variables ONNF_DEP_DIR, LLVM_PROJECT_ROOT
if [[ -z "${DLC_DEP_DIR}" ]]; then if [[ -z "${ONNF_DEP_DIR}" ]]; then
echo "DLC_DEP_DIR env var is missing." echo "ONNF_DEP_DIR env var is missing."
exit 1 exit 1
fi fi
if [[ -z "${LLVM_PROJECT_ROOT}" ]]; then if [[ -z "${LLVM_PROJECT_ROOT}" ]]; then
@ -10,11 +10,11 @@ if [[ -z "${LLVM_PROJECT_ROOT}" ]]; then
exit 1 exit 1
fi fi
# Set up env variables to expose dlc dependencies: # Set up env variables to expose onnf dependencies:
export PATH=$DLC_DEP_DIR/bin:$PATH export PATH=$ONNF_DEP_DIR/bin:$PATH
export LD_LIBRARY_PATH=$DLC_DEP_DIR/lib:$DLC_DEP_DIR/lib64: export LD_LIBRARY_PATH=$ONNF_DEP_DIR/lib:$ONNF_DEP_DIR/lib64:
export CPATH=$DLC_DEP_DIR/include:$CPATH export CPATH=$ONNF_DEP_DIR/include:$CPATH
export PATH=$DLC_DEP_DIR/bin:$PATH export PATH=$ONNF_DEP_DIR/bin:$PATH
# Set up mock installation path within current workspace: # Set up mock installation path within current workspace:
export INSTALL_PATH=$WORKSPACE/INSTALL_PATH export INSTALL_PATH=$WORKSPACE/INSTALL_PATH
@ -24,19 +24,19 @@ export LD_LIBRARY_PATH=$INSTALL_PATH/lib:$INSTALL_PATH/lib64:$LD_LIBRARY_PATH
export CPATH=$INSTALL_PATH/include:$CPATH export CPATH=$INSTALL_PATH/include:$CPATH
# Create virtual environment specific to the current build instance: # Create virtual environment specific to the current build instance:
conda create -n dlc_conda_workspace_"${BUILD_NUMBER}" python=3.7 numpy conda create -n onnf_conda_workspace_"${BUILD_NUMBER}" python=3.7 numpy
source activate dlc_conda_workspace_"${BUILD_NUMBER}" source activate onnf_conda_workspace_"${BUILD_NUMBER}"
# Create build directory and generate make files: # Create build directory and generate make files:
mkdir build && cd build mkdir build && cd build
CC=$DLC_DEP_DIR/bin/gcc \ CC=$ONNF_DEP_DIR/bin/gcc \
CXX=$DLC_DEP_DIR/bin/g++ \ CXX=$ONNF_DEP_DIR/bin/g++ \
BOOST_ROOT=$DLC_DEP_DIR \ BOOST_ROOT=$ONNF_DEP_DIR \
LLVM_PROJECT_SRC=$LLVM_PROJECT_ROOT \ LLVM_SRC=$LLVM_PROJECT_ROOT/llvm \
LLVM_PROJECT_BUILD=$LLVM_PROJECT_ROOT/build \ LLVM_BUILD=$LLVM_PROJECT_ROOT/build \
cmake3 -DDLC_ENABLE_MODEL_TEST_CPP=ON \ cmake3 -DONNF_ENABLE_MODEL_TEST_CPP=ON \
-DDLC_ENABLE_BENCHMARK=ON \ -DONNF_ENABLE_BENCHMARK=ON \
-DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" \ -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" \
.. ..
# Build and test: # Build and test:

View File

@ -26,10 +26,10 @@ cmake -DCMAKE_C_COMPILER=$CC \
-DCMAKE_CXX_COMPILER=$CXX \ -DCMAKE_CXX_COMPILER=$CXX \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
-DDLC_ENABLE_NODE_TEST_JAVA=ON \ -DONNF_ENABLE_NODE_TEST_JAVA=ON \
-DDLC_ENABLE_NODE_TEST_JNI=ON \ -DONNF_ENABLE_NODE_TEST_JNI=ON \
-DDLC_ENABLE_NODE_TEST_CPP=OFF \ -DONNF_ENABLE_NODE_TEST_CPP=OFF \
-DDLC_TARGET_ARCH=z13 .. -DONNF_TARGET_ARCH=z13 ..
make -j "$(nproc)" install make -j "$(nproc)" install
ctest -j "$(nproc)" ctest -j "$(nproc)"