From 2d2adb78150dba0f340292dc523b39612bd1e181 Mon Sep 17 00:00:00 2001 From: Arup Sarker Date: Sat, 8 Jun 2024 19:07:18 -0400 Subject: [PATCH] [Cylon] Fix CI command Signed-off-by: Arup Sarker --- .github/workflows/c-cpp.yml | 2 +- .github/workflows/macos.yml | 2 +- build.py | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index bac91fc3a..c8249cd42 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -22,7 +22,7 @@ jobs: - name: Installing UCX run: wget https://github.com/openucx/ucx/releases/download/v1.13.1/ucx-1.13.1.tar.gz -P $HOME/ucx && (cd $HOME/ucx && tar xzf ucx-1.13.1.tar.gz) && (cd $HOME/ucx/ucx-1.13.1 && ./contrib/configure-release --prefix=$PWD/install --with-go=no && make -j8 install) - name: Build and test - run: python3 -m venv ENV && ./build.sh -pyenv $(pwd)/ENV -bpath $(pwd)/build --python_with_pyarrow --test --pytest --cmake-flags "-DCYLON_UCX=ON -DUCX_LIBDIR=$HOME/ucx/ucx-1.13.1/install/lib -DUCX_INCLUDEDIR=$HOME/ucx/ucx-1.13.1/install/include" + run: python3 -m venv ENV && ./build.sh -pyenv $(pwd)/ENV -bpath $(pwd)/build --cpp --test --python --pytest --cmake-flags "-DCYLON_UCX=ON -DUCX_LIBDIR=$HOME/ucx/ucx-1.13.1/install/lib -DUCX_INCLUDEDIR=$HOME/ucx/ucx-1.13.1/install/include" - name: Build java run: ./build.sh -pyenv $(pwd)/ENV -bpath $(pwd)/build --java diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 15cbb3d38..e08c295ce 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,7 +27,7 @@ jobs: - name: Remove link for preventing an error run: rm -f /usr/local/bin/2to3 - name: Install dependencies - run: brew install re2 automake boost brotli c-ares ccache flatbuffers grpc llvm lz4 minio ninja openssl@1.1 protobuf rapidjson snappy thrift wget zstd + run: brew install re2 automake boost brotli c-ares ccache flatbuffers grpc llvm lz4 minio ninja openssl@1.1 protobuf rapidjson snappy thrift wget zstd miniconda - uses: conda-incubator/setup-miniconda@v2 with: diff --git a/build.py b/build.py index 1907c9316..85c62cf3b 100644 --- a/build.py +++ b/build.py @@ -218,13 +218,14 @@ def build_cpp(): verb = '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON' if args.verbose else '' clean = '--clean-first' if args.clean else '' - pyarrow_location = os.path.dirname(pa.__file__) - conda_prefix = check_conda_prefix() - if not os.path.exists(f"{conda_prefix}/lib/libarrow_python.so"): - sym_generator = f"ln -s {pyarrow_location}/libarrow_python.so {conda_prefix}/lib/libarrow_python.so" - logger.info(f"Generate Symbolic link: {sym_generator}") - res = subprocess.call(sym_generator, cwd=BUILD_DIR, shell=True) - check_status(res, "Generate Symbolic link") + if OS_NAME == 'Linux': + pyarrow_location = os.path.dirname(pa.__file__) + conda_prefix = check_conda_prefix() + if not os.path.exists(f"{conda_prefix}/lib/libarrow_python.so"): + sym_generator = f"ln -s {pyarrow_location}/libarrow_python.so {conda_prefix}/lib/libarrow_python.so" + logger.info(f"Generate Symbolic link: {sym_generator}") + res = subprocess.call(sym_generator, cwd=BUILD_DIR, shell=True) + check_status(res, "Generate Symbolic link") os.environ['CC']=f"{conda_prefix}/bin/mpicc"