Skip to content

Commit b35e272

Browse files
authored
Merge pull request #523 from abergeron/circleci
Add a CircleCI build config.
2 parents 3a72b3f + 2bbbcbe commit b35e272

3 files changed

Lines changed: 43 additions & 17 deletions

File tree

.circleci/config.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: 2
2+
3+
jobs:
4+
build_pkgs:
5+
docker:
6+
- image: milaudem/libgpuarray:0
7+
8+
steps:
9+
- checkout
10+
- run:
11+
name: "Checkout Merge Commit"
12+
command: |
13+
if [[ -n "${CIRCLE_PR_NUMBER}" ]]
14+
then
15+
git fetch -u origin "+refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge"
16+
git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge"
17+
fi
18+
- run:
19+
name: "Build Recipe"
20+
command: |
21+
export GPUARRAY_VERSION=`python -c 'import versioneer; print(versioneer.get_version())'`
22+
conda build --python 2.7 conda
23+
conda build --python 3.5 conda/pygpu
24+
conda build --python 3.6 conda/pygpu
25+
- run:
26+
name: "Upload Tagged Versions"
27+
command: |
28+
if [[ -n "${CIRCLE_TAG}" ]]
29+
then
30+
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/libgpuarray*
31+
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/pygpu*
32+
fi
33+
- store_artifacts:
34+
path: /miniconda/conda-bld/linux-64
35+
36+
workflows:
37+
version: 2
38+
build_and_test:
39+
jobs:
40+
- build_pkgs

.travis.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,13 @@ language: c
22

33
matrix:
44
include:
5-
- os: linux
6-
compiler: gcc
7-
- os: linux
8-
compiler: clang
95
- os: osx
106
compiler: clang
117

12-
addons:
13-
apt:
14-
sources:
15-
- kalakris-cmake
16-
- george-edison55-precise-backports
17-
packages:
18-
- cmake
19-
- cmake-data
20-
- doxygen
21-
228
before_install:
239
- export PREFIX=$HOME/.local
24-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install doxygen; fi
25-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PYTHONUSERBASE=$PREFIX; fi
10+
- brew update && brew install doxygen; fi
11+
- export PYTHONUSERBASE=$PREFIX; fi
2612
- pip install --user breathe sphinx==1.6.3 sphinx_rtd_theme cython numpy 'mako>=0.7' six
2713
- export PATH=$PATH:$PREFIX/bin
2814
- export CPATH=$CPATH:$PREFIX/include

src/loaders/dyn_load.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void *ga_load_library(const char *name, error *e) {
1919
void *ga_func_ptr(void *h, const char *name, error *e) {
2020
void *res = dlsym(h, name);
2121
if (res == NULL)
22-
error_fmt(e, GA_LOAD_ERROR, "Could not find synbol \"%s\": %s", name, dlerror());
22+
error_fmt(e, GA_LOAD_ERROR, "Could not find symbol \"%s\": %s", name, dlerror());
2323
return res;
2424
}
2525

0 commit comments

Comments
 (0)