Skip to content

Commit 76ce5d7

Browse files
committed
Add PGI
1 parent f9859d6 commit 76ce5d7

File tree

4 files changed

+43
-57
lines changed

4 files changed

+43
-57
lines changed

.circleci/config.yml

Lines changed: 30 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ variables:
1717
working_directory: ~/cmake-cookbook
1818
setup: &setup
1919
run:
20-
name: Set up Python dependencies
20+
name: Set up base system and Python dependencies
2121
command: |
2222
cat >> $BASH_ENV <<EOF
2323
if [[ "$CIRCLECI_COMPILER" == "intel" ]] ; then
@@ -36,19 +36,19 @@ variables:
3636
name: Testing
3737
shell: /bin/bash
3838
command: |
39-
pipenv run python testing/collect_tests.py 'chapter-01/recipe-*' &&
40-
pipenv run python testing/collect_tests.py 'chapter-02/recipe-*' &&
41-
pipenv run python testing/collect_tests.py 'chapter-03/recipe-*' &&
42-
pipenv run python testing/collect_tests.py 'chapter-04/recipe-*' &&
43-
pipenv run python testing/collect_tests.py 'chapter-05/recipe-*' &&
44-
pipenv run python testing/collect_tests.py 'chapter-06/recipe-*' &&
45-
pipenv run python testing/collect_tests.py 'chapter-07/recipe-*' &&
46-
pipenv run python testing/collect_tests.py 'chapter-08/recipe-*' &&
47-
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
48-
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
49-
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
50-
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
51-
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
39+
pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'
40+
pipenv run python testing/collect_tests.py 'chapter-02/recipe-*'
41+
pipenv run python testing/collect_tests.py 'chapter-03/recipe-*'
42+
pipenv run python testing/collect_tests.py 'chapter-04/recipe-*'
43+
pipenv run python testing/collect_tests.py 'chapter-05/recipe-*'
44+
pipenv run python testing/collect_tests.py 'chapter-06/recipe-*'
45+
pipenv run python testing/collect_tests.py 'chapter-07/recipe-*'
46+
pipenv run python testing/collect_tests.py 'chapter-08/recipe-*'
47+
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*'
48+
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*'
49+
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]'
50+
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*'
51+
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'
5252
pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'
5353
tests-conda: &tests-conda
5454
run:
@@ -73,49 +73,26 @@ jobs:
7373
- *setup
7474
- *report
7575
- *tests-conda
76+
pgi:
77+
<<: *pgi-linux
78+
steps:
79+
- checkout
80+
- *setup
81+
- *report
82+
- *tests
83+
pgi-conda:
84+
<<: *pgi-linux
85+
steps:
86+
- checkout
87+
- *setup
88+
- *report
89+
- *tests-conda
7690

7791
workflows:
7892
version: 2
7993
build:
8094
jobs:
8195
- intel
8296
- intel-conda
83-
84-
#jobs:
85-
# build:
86-
# docker:
87-
# - image: devcafe/cmake-cookbook_circleci_ubuntu16.04-intel2018.1
88-
# user: root
89-
# environment:
90-
# CIRCLECI_COMPILER: intel
91-
# working_directory: ~/cmake-cookbook
92-
# steps:
93-
# - checkout
94-
# - run:
95-
# name: Python dependencies
96-
# command: |
97-
# pip install --user pipenv --upgrade pip
98-
# pipenv install --three
99-
# - run:
100-
# name: Report
101-
# command: |
102-
# pipenv run python --version
103-
# - run:
104-
# shell: /bin/bash
105-
# name: Testing
106-
# command: |
107-
# source /opt/intel/bin/compilervars.sh -arch intel64 -platform linux
108-
# pipenv run python testing/collect_tests.py 'chapter-01/recipe-*' &&
109-
# pipenv run python testing/collect_tests.py 'chapter-02/recipe-*' &&
110-
# pipenv run python testing/collect_tests.py 'chapter-03/recipe-*' &&
111-
# pipenv run python testing/collect_tests.py 'chapter-04/recipe-*' &&
112-
# pipenv run python testing/collect_tests.py 'chapter-05/recipe-*' &&
113-
# pipenv run python testing/collect_tests.py 'chapter-06/recipe-*' &&
114-
# pipenv run python testing/collect_tests.py 'chapter-07/recipe-*' &&
115-
# pipenv run python testing/collect_tests.py 'chapter-08/recipe-*' &&
116-
# pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
117-
# pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
118-
# pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
119-
# pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
120-
# pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
121-
# pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'
97+
- pgi
98+
- pgi-conda

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
[![Travis branch](https://img.shields.io/travis/dev-cafe/cmake-cookbook/master.svg?style=flat-square)](https://travis-ci.org/dev-cafe/cmake-cookbook)
55
[![AppVeyor branch](https://img.shields.io/appveyor/ci/bast/cmake-cookbook/master.svg?style=flat-square)](https://ci.appveyor.com/project/bast/cmake-cookbook/branch/master)
6+
[![CircleCI](https://circleci.com/gh/robertodr/cmake-cookbook.svg?style=svg)](https://circleci.com/gh/robertodr/cmake-cookbook)
67

78
[![GitHub issues](https://img.shields.io/github/issues/dev-cafe/cmake-cookbook.svg?style=flat-square)](https://github.com/dev-cafe/cmake-cookbook/issues)
89
[![GitHub forks](https://img.shields.io/github/forks/dev-cafe/cmake-cookbook.svg?style=flat-square)](https://github.com/dev-cafe/cmake-cookbook/network)

chapter-03/recipe-07/cxx-example-3.5/menu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
drone:
1+
circle-intel:
22
definitions:
3-
- Eigen3_DIR: '$HOME/Deps/eigen/share/eigen3/cmake'
3+
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
4+
5+
circle-pgi:
6+
definitions:
7+
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
48

59
travis-linux:
610
definitions:

chapter-03/recipe-07/cxx-example/menu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
drone:
1+
circle-intel:
22
definitions:
3-
- Eigen3_DIR: '$HOME/Deps/eigen/share/eigen3/cmake'
3+
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
4+
5+
circle-pgi:
6+
definitions:
7+
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
48

59
travis-linux:
610
definitions:

0 commit comments

Comments
 (0)