Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit 34a00e2

Browse files
bearzxbearzx
committed
tweak conda linux build recipe
1 parent 6837d5a commit 34a00e2

File tree

2 files changed

+81
-72
lines changed

2 files changed

+81
-72
lines changed

‎.github/workflows/nightly-conda.yml

+70-70
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
matrix:
2222
python-version:
2323
- 3.7
24-
- 3.8
25-
- 3.9
24+
# - 3.8
25+
# - 3.9
2626
steps:
2727
- name: Print CPU info
2828
run: |
@@ -99,71 +99,71 @@ jobs:
9999
conda install -yq -c anaconda anaconda-client
100100
anaconda -t "${CONDA_NIGHTLY_PYTORCHBOT_TOKEN}" upload ./conda-bld/linux-64/torcharrow-*.tar.bz2 -u "$CONDA_CHANNEL" --label main --no-progress --force
101101
102-
macos-container:
103-
runs-on: macos-latest
104-
strategy:
105-
fail-fast: false
106-
matrix:
107-
python-version:
108-
- 3.7
109-
- 3.8
110-
- 3.9
111-
steps:
112-
- name: Create Conda Env
113-
uses: conda-incubator/setup-miniconda@v2
114-
with:
115-
python-version: ${{ matrix.python-version }}
116-
activate-environment: conda_build_env
117-
118-
- name: Check out source repository
119-
uses: actions/checkout@v2
120-
with:
121-
submodules: recursive
122-
123-
- name: Install dependencies from Brew
124-
run: |
125-
brew install --formula ninja flex bison cmake ccache icu4c boost gflags glog libevent
126-
127-
- name: Conda Build
128-
shell: bash -l {0}
129-
env:
130-
PYTHON_VERSION: ${{ matrix.python-version }}
131-
MACOSX_DEPLOYMENT_TARGET: 10.15
132-
CPU_TARGET: sse
133-
run: |
134-
conda activate conda_build_env
135-
conda install -yq conda-build -c conda-forge
136-
scripts/build_mac_dep.sh ranges_v3 fmt double_conversion folly re2
137-
./packaging/build_conda.sh
138-
139-
- name: Fix Velox Dylib Paths
140-
shell: bash -l {0}
141-
env:
142-
PYTHON_VERSION: ${{ matrix.python-version }}
143-
run: |
144-
cd conda-bld/osx-64
145-
pkg_name=`ls ./torcharrow-* | sed -n -e 's/.*\(torcharrow.*\).tar.bz2/\1/p'`
146-
mkdir ./${pkg_name}
147-
tar -xf ./${pkg_name}.tar.bz2 -C ./${pkg_name}
148-
rm ./${pkg_name}.tar.bz2
149-
cd ./${pkg_name}
150-
151-
source ${GITHUB_WORKSPACE}/packaging/fix_conda_dylib_paths.sh
152-
conda_lib_folder=lib/python${PYTHON_VERSION}/site-packages/torcharrow
153-
so_name=`ls ${conda_lib_folder}/_torcharrow.* | sed -n -e 's/.*\(_torcharrow.*\.so\)/\1/p'`
154-
fix_velox_dylib_paths ${conda_lib_folder}/${so_name}
155-
otool -L ${conda_lib_folder}/${so_name}
156-
157-
tar -cjf ../${pkg_name}.tar.bz2 *
158-
cd ..
159-
rm -rf ./${pkg_name}
160-
cd ../..
161-
162-
- name: Conda Upload
163-
shell: bash -l {0}
164-
env:
165-
PYTHON_VERSION: ${{ matrix.python-version }}
166-
CONDA_NIGHTLY_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_NIGHTLY_PYTORCHBOT_TOKEN }}
167-
run: |
168-
conda install -yq anaconda-client
169-
anaconda -t "${CONDA_NIGHTLY_PYTORCHBOT_TOKEN}" upload ./conda-bld/osx-64/torcharrow-*.tar.bz2 -u "$CONDA_CHANNEL" --label main --no-progress --force
102+
# macos-container:
103+
# runs-on: macos-latest
104+
# strategy:
105+
# fail-fast: false
106+
# matrix:
107+
# python-version:
108+
# - 3.7
109+
# - 3.8
110+
# - 3.9
111+
# steps:
112+
# - name: Create Conda Env
113+
# uses: conda-incubator/setup-miniconda@v2
114+
# with:
115+
# python-version: ${{ matrix.python-version }}
116+
# activate-environment: conda_build_env
117+
118+
# - name: Check out source repository
119+
# uses: actions/checkout@v2
120+
# with:
121+
# submodules: recursive
122+
123+
# - name: Install dependencies from Brew
124+
# run: |
125+
# brew install --formula ninja flex bison cmake ccache icu4c boost gflags glog libevent
126+
127+
# - name: Conda Build
128+
# shell: bash -l {0}
129+
# env:
130+
# PYTHON_VERSION: ${{ matrix.python-version }}
131+
# MACOSX_DEPLOYMENT_TARGET: 10.15
132+
# CPU_TARGET: sse
133+
# run: |
134+
# conda activate conda_build_env
135+
# conda install -yq conda-build -c conda-forge
136+
# scripts/build_mac_dep.sh ranges_v3 fmt double_conversion folly re2
137+
# ./packaging/build_conda.sh
138+
139+
# - name: Fix Velox Dylib Paths
140+
# shell: bash -l {0}
141+
# env:
142+
# PYTHON_VERSION: ${{ matrix.python-version }}
143+
# run: |
144+
# cd conda-bld/osx-64
145+
# pkg_name=`ls ./torcharrow-* | sed -n -e 's/.*\(torcharrow.*\).tar.bz2/\1/p'`
146+
# mkdir ./${pkg_name}
147+
# tar -xf ./${pkg_name}.tar.bz2 -C ./${pkg_name}
148+
# rm ./${pkg_name}.tar.bz2
149+
# cd ./${pkg_name}
150+
151+
# source ${GITHUB_WORKSPACE}/packaging/fix_conda_dylib_paths.sh
152+
# conda_lib_folder=lib/python${PYTHON_VERSION}/site-packages/torcharrow
153+
# so_name=`ls ${conda_lib_folder}/_torcharrow.* | sed -n -e 's/.*\(_torcharrow.*\.so\)/\1/p'`
154+
# fix_velox_dylib_paths ${conda_lib_folder}/${so_name}
155+
# otool -L ${conda_lib_folder}/${so_name}
156+
157+
# tar -cjf ../${pkg_name}.tar.bz2 *
158+
# cd ..
159+
# rm -rf ./${pkg_name}
160+
# cd ../..
161+
162+
# - name: Conda Upload
163+
# shell: bash -l {0}
164+
# env:
165+
# PYTHON_VERSION: ${{ matrix.python-version }}
166+
# CONDA_NIGHTLY_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_NIGHTLY_PYTORCHBOT_TOKEN }}
167+
# run: |
168+
# conda install -yq anaconda-client
169+
# anaconda -t "${CONDA_NIGHTLY_PYTORCHBOT_TOKEN}" upload ./conda-bld/osx-64/torcharrow-*.tar.bz2 -u "$CONDA_CHANNEL" --label main --no-progress --force

‎packaging/torcharrow/meta.yaml

+11-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,21 @@ requirements:
2222
- pyarrow
2323
- arrow-cpp==8.0.0
2424
- cffi
25-
- glog==0.6.0
2625
- libsodium
27-
- libboost
2826
- libevent
2927
- bzip2
3028
- lz4-c
29+
- libboost
30+
{% if osx %}
31+
- glog==0.6.0
32+
# - libboost
33+
{% elif linux %}
34+
- glog==0.4.0
35+
# - libboost==1.71.0
36+
# - double-conversion
37+
# - re2==2020.01.01
38+
{% endif %}
39+
3140

3241
build:
3342
string: py{{py}}

0 commit comments

Comments
 (0)