Skip to content

Commit 5f53791

Browse files
authored
Merge pull request #15 from BlazingDB/feature/rapids-thirdparty
[REVIEW] Adding rapids-thirdparty
2 parents db4c17a + 8b4156d commit 5f53791

File tree

8 files changed

+46
-3
lines changed

8 files changed

+46
-3
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
echo "CMD: conda build ${CONDA_CH} -c conda-forge -c defaults conda/recipes/bsql-rapids-thirdparty/"
4+
conda build ${CONDA_CH} -c conda-forge -c defaults conda/recipes/bsql-rapids-thirdparty/

ci/cpu/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ source ci/cpu/bsql-toolchain-aws/conda-build.sh
6868
logger "Build conda pkg for toolchain-gcp..."
6969
source ci/cpu/bsql-toolchain-gcp/conda-build.sh
7070

71+
logger "Build conda pkg for bsql-rapids-thirdparty..."
72+
source ci/cpu/bsql-rapids-thirdparty/conda-build.sh
73+
7174
logger "Build conda pkg for toolchain..."
7275
source ci/cpu/bsql-toolchain/conda-build.sh
7376

ci/cpu/upload_anaconda.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44

55
export AWS_FILE=`conda build conda/recipes/bsql-toolchain-aws-cpp/ --output`
66
export GCP_FILE=`conda build conda/recipes/bsql-toolchain-gcp-cpp/ --output`
7+
export RAPIDS_FILE=`conda build conda/recipes/bsql-rapids-thirdparty/ --output`
78
export TAR_FILE=`conda build conda/recipes/bsql-toolchain/ --output`
89

910
LABEL_OPTION="--label main"
@@ -22,6 +23,10 @@ test -e ${GCP_FILE}
2223
echo "Upload file: "${GCP_FILE}
2324
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_UPLOAD} ${LABEL_OPTION} --force ${GCP_FILE}
2425

26+
test -e ${RAPIDS_FILE}
27+
echo "Upload file: "${RAPIDS_FILE}
28+
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_UPLOAD} ${LABEL_OPTION} --force ${RAPIDS_FILE}
29+
2530
test -e ${TAR_FILE}
2631
echo "Upload file: "${TAR_FILE}
2732
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_UPLOAD} ${LABEL_OPTION} --force ${TAR_FILE}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
INSTALL_PREFIX=${INSTALL_PREFIX:=${PREFIX:=${CONDA_PREFIX}}}
4+
5+
DIR_BSQL="bsql-rapids-thirdparty"
6+
mkdir -p $INSTALL_PREFIX/include/bsql-rapids-thirdparty/
7+
git clone -b branch-0.12 --recurse-submodules https://github.com/rapidsai/cudf.git
8+
9+
cp -rf cudf/thirdparty/cub ${INSTALL_PREFIX}/include/$DIR_BSQL/cub
10+
11+
rm -rf cudf/thirdparty/libcudacxx/libcxx/test/
12+
cp -rf cudf/thirdparty/libcudacxx ${INSTALL_PREFIX}/include/$DIR_BSQL/libcudacxx
13+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
2+
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
3+
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
4+
5+
package:
6+
name: bsql-rapids-thirdparty
7+
version: {{ version }}
8+
9+
source:
10+
path: ../../..
11+
12+
build:
13+
number: {{ git_revision_count }}
14+
string: {{ git_revision_count }}
15+
16+
about:
17+
home: http://www.blazingsql.com/
18+
license: Apache-2.0
19+
license_family: Apache
20+
license_file: LICENSE

conda/recipes/bsql-toolchain-aws-cpp/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{% set build = environ.get('BUILD', '0').lstrip('v') %}
21
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
32
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
43
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}

conda/recipes/bsql-toolchain-gcp-cpp/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{% set build = environ.get('BUILD', '0').lstrip('v') %}
21
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
32
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
43
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}

conda/recipes/bsql-toolchain/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{% set build = environ.get('BUILD', '0').lstrip('v') %}
21
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
32
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
43
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
@@ -18,6 +17,7 @@ requirements:
1817
run:
1918
- bsql-toolchain-aws-cpp
2019
- bsql-toolchain-gcp-cpp
20+
- bsql-rapids-thirdparty
2121

2222
about:
2323
home: http://www.blazingsql.com/

0 commit comments

Comments
 (0)