Skip to content

Commit 31df2da

Browse files
committed
put back gcc-10 and try to copy pythranc to $HOME
1 parent caae342 commit 31df2da

13 files changed

+23
-21
lines changed

.github/workflows/book.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
- uses: actions/checkout@v2
1616

1717
- name: Install python dependencies
18-
run: pip3 install -r requirements.txt
18+
run: |
19+
cp .pythranrc ~/.pythranc
20+
pip3 install -r requirements.txt
1921
2022
- name: Install Julia packages
2123
run: julia -e '

01.f2py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ def fonction(i) : # python function
389389

390390
%env OMP_NUM_THREADS=4
391391
if sys.platform == "darwin":
392-
os.environ["CC"] = "gcc-9"
392+
os.environ["CC"] = "gcc-10"
393393
os.environ["FC"] = "gfortran"
394394

395395
# + {"slideshow": {"slide_type": "fragment"}}

03.julia-set.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import os, sys, gc
2929

3030
if sys.platform == 'darwin':
31-
os.environ['CC'] = 'gcc-9'
32-
os.environ['CXX'] = 'g++-9'
31+
os.environ['CC'] = 'gcc-10'
32+
os.environ['CXX'] = 'g++-10'
3333
# -
3434

3535
import warnings
@@ -159,15 +159,15 @@ def plot_julia_set(julia):
159159
#
160160
# ### Configuration
161161
#
162-
# `~/.pythranrc` file on my mac (gcc is installed with hombrew and pythran with pip)
162+
# `~/.pythranrc` file on macos (gcc is installed with hombrew and pythran with pip)
163163
#
164164
# ```
165165
# [compiler]
166166
# include_dirs=/usr/local/opt/openblas/include
167167
# library_dirs=/usr/local/opt/openblas/lib
168168
# blas=openblas
169-
# CXX=g++-9
170-
# CC=gcc-9
169+
# CXX=g++-10
170+
# CC=gcc-10
171171
# ```
172172

173173
%load_ext pythran.magic

04.vlasov-poisson.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import sys
4545

4646
if sys.platform == "darwin":
47-
%env CC='gcc-9'
47+
%env CC='gcc-10'
4848
# -
4949

5050
# ## Bspline

05.co-rotating-vortex.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import sys
3030

3131
if sys.platform == "darwin":
32-
%env CC=gcc-9
32+
%env CC=gcc-10
3333
# -
3434

3535
# %load_ext fortranmagic

06.gray-scott-model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import sys
2323
if sys.platform == "darwin":
24-
%env CC=gcc-9
24+
%env CC=gcc-10
2525

2626
import numpy as np
2727

08.swig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ def syracuse(n):
237237
import sys, os
238238

239239
if sys.platform == "darwin":
240-
os.environ["CC"] = "gcc-9"
240+
os.environ["CC"] = "gcc-10"
241241

242242
!{sys.executable} setup.py build_ext --inplace --quiet
243243

notebooks/01.f2py.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@
871871
"\n",
872872
"%env OMP_NUM_THREADS=4\n",
873873
"if sys.platform == \"darwin\":\n",
874-
" os.environ[\"CC\"] = \"gcc-9\"\n",
874+
" os.environ[\"CC\"] = \"gcc-10\"\n",
875875
" os.environ[\"FC\"] = \"gfortran\""
876876
]
877877
},

notebooks/03.julia-set.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"import os, sys, gc\n",
3232
"\n",
3333
"if sys.platform == 'darwin':\n",
34-
" os.environ['CC'] = 'gcc-9'\n",
35-
" os.environ['CXX'] = 'g++-9'"
34+
" os.environ['CC'] = 'gcc-10'\n",
35+
" os.environ['CXX'] = 'g++-10'"
3636
]
3737
},
3838
{
@@ -296,15 +296,15 @@
296296
"\n",
297297
"### Configuration\n",
298298
"\n",
299-
"`~/.pythranrc` file on my mac (gcc is installed with hombrew and pythran with pip)\n",
299+
"`~/.pythranrc` file on macos (gcc is installed with hombrew and pythran with pip)\n",
300300
"\n",
301301
"```\n",
302302
"[compiler]\n",
303303
"include_dirs=/usr/local/opt/openblas/include\n",
304304
"library_dirs=/usr/local/opt/openblas/lib\n",
305305
"blas=openblas\n",
306-
"CXX=g++-9\n",
307-
"CC=gcc-9\n",
306+
"CXX=g++-10\n",
307+
"CC=gcc-10\n",
308308
"```"
309309
]
310310
},

notebooks/04.vlasov-poisson.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"import sys\n",
4040
"\n",
4141
"if sys.platform == \"darwin\":\n",
42-
" %env CC='gcc-9'"
42+
" %env CC='gcc-10'"
4343
]
4444
},
4545
{

0 commit comments

Comments
 (0)