Commitac01ec8

committed

more updates

1 parent6a39eed commitac01ec8Copy full SHA for ac01ec8

File tree

+16

-11

lines changed

+16

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ Here's the implementation of our Mandelbrot generator:`
`250`	`250`	`We build the shared library as:`
`251`	`251`
`252`	`252`	```bash
`253`		`-g++ -O3 -Wall -Wextra -shared -std=c++17 -fPIC$(python3 -m pybind11 --includes) mandel.cpp -o mandel$(python3-config --extension-suffix)`
	`253`	`+g++ -DNDEBUG -O3 -Wall -Wextra -shared -std=c++17 -fPIC$(python3 -m pybind11 --includes) mandel.cpp -o mandel$(python3-config --extension-suffix)`
`254`	`254`	```
`255`	`255`
`256`	`256`	`Our driver is essentially the same as the Fortran one.`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ and weaknesses.`
`19`	`19`	`header-only library that allows you to call C++ functions directly`
`20`	`20`	`from python.`
`21`	`21`
	`22`	`+ A related library is[nanobind](https://github.com/wjakob/nanobind),`
	`23`	`+ which has similar syntax but may be more efficient.`
	`24`	`+`
`22`	`25`	`* C`
`23`	`26`
`24`	`27`	`*[C-API](https://docs.python.org/3/c-api/index.html) : the`
`@@ -33,9 +36,12 @@ and weaknesses.`
`33`	`36`	`represent the arrays we use. This means writing a lot of`
`34`	`37`	`boilerplate code just to deal with some simple operations.`
`35`	`38`
`36`		`- This underlies most of the techniques that we'll see here.`
	`39`	`+ This underlies many of the techniques that we'll see here.`
	`40`	`+`
	`41`	`+ .. note::`
`37`	`42`
`38`		`- These days, there are better methods for most applications.`
	`43`	`+ These days, there are better methods for most applications,`
	`44`	`+ and you should probably not use the C-API directly.`
`39`	`45`
`40`	`46`	`*[ctypes](https://docs.python.org/3/library/ctypes.html) : this`
`41`	`47`	`is a module that allows you to call functions in shared libraries.`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-#include<iostream>`
	`1`	`+#include<cstddef>`
`2`	`2`	`#include<cmath>`
`3`	`3`	`#include<complex>`
`4`		`-#include<vector>`
`5`	`4`
`6`	`5`	`#include<pybind11/pybind11.h>`
`7`	`6`	`#include<pybind11/numpy.h>`
`@@ -33,9 +32,9 @@ py::array_t<int> mandelbrot(int N,`
`33`	`32`	`// construct the numpy array we will return`
`34`	`33`	`// we need to specify the strides manually`
`35`	`34`
`36`		`-constexprsize_t elsize =sizeof(int);`
`37`		`-size_t shape[2]{N, N};`
`38`		`-size_t strides[2]{N * elsize, elsize};`
	`35`	`+constexprstd::size_t elsize =sizeof(int);`
	`36`	`+std::size_t shape[2]{N, N};`
	`37`	`+std::size_t strides[2]{N * elsize, elsize};`
`39`	`38`	`auto m = py::array_t<int>(shape, strides);`
`40`	`39`	`auto m_view = m.mutable_unchecked<2>();`
`41`	`40`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ py::array_t<int> mandelbrot(int N,`
`21`	`21`	`// construct the numpy array we will return`
`22`	`22`	`// we need to specify the strides manually`
`23`	`23`
`24`		`-constexprsize_t elsize =sizeof(int);`
`25`		`-size_t shape[2]{N, N};`
`26`		`-size_t strides[2]{N * elsize, elsize};`
	`24`	`+constexprstd::size_t elsize =sizeof(int);`
	`25`	`+std::size_t shape[2]{N, N};`
	`26`	`+std::size_t strides[2]{N * elsize, elsize};`
`27`	`27`	`auto m = py::array_t<int>(shape, strides);`
`28`	`28`	`auto m_view = m.mutable_unchecked<2>();`
`29`	`29`

Comments

(0)