Merge pull request #19 from gjbex/development

Various fixes

Author: gjbex

python_for_hpc.pptx

@@ -1,14 +1,21 @@
 VERSION = $(shell python3-config --extension-suffix)
-PRIMES_LIBS = primes_cython.$(VERSION).so primes_cython3.$(VERSION).so \
-			  primes_pure_python.$(VERSION).so primes_pure_malloc.$(VERSION).so \
-			  primes_malloc.$(VERSION).so
+SRC_FILES = primes_cython.pyx \
+			primes_malloc.pyx \
+			primes_pure_python.py \
+			primes_pure_malloc.py
+PRIMES_LIBS = $(addsuffix $(VERSION), $(basename $(SRC_FILES)))
+C_FILES = $(addsuffix .c, $(basename $(SRC_FILES)))
 
 all: $(PRIMES_LIBS)
 
-$(PRIMES_LIBS): primes_cython.pyx primes_pure_python.py
+%$(VERSION): %.pyx
+	python setup.py build_ext --inplace
+
+%$(VERSION): %.py
 	python setup.py build_ext --inplace
 
 clean:
 	python setup.py clean
-	$(RM) primes_cython.c primes_cython3.c primes_pure_python.c primes_malloc.c $(PRIMES_LIBS)
+	$(RM) $(PRIMES_LIBS)
+	$(RM) $(C_FILES)
 	$(RM) -r build/

source-code/cython/Primes/Makefile

@@ -6,6 +6,6 @@ double mul(double a, double b) {
     return a * b;
 }
 
-double div(double a, double b) {
+double divide(double a, double b) {
     return a/b;
 }

source-code/interfacing-c-c++-fortran/Pybind11/Simple/computations.cpp

@@ -3,6 +3,6 @@
 
 double add(double a, double b);
 double mul(double a, double b);
-double div(double a, double b);
+double divide(double a, double b);
 
 #endif

source-code/interfacing-c-c++-fortran/Pybind11/Simple/computations.h

@@ -1,10 +1,12 @@
 #include <pybind11/pybind11.h>
 #include "computations.h"
 
+namespace py = pybind11;
+
 PYBIND11_MODULE(computations, m) {
     m.doc() = "pybind11 wrapper module for cmoputations.h";
     m.def("add", &add, "function that adds two numbers");
     m.def("mul", &mul, "function that multiplies two numbers");
-    m.def("div", &div, "function that divides two numbers"
-            py::arg("left_op"), py::arg("right_op"));
+    m.def("div", &divide, "function that divides two numbers",
+            py::arg("num"), py::arg("denom"));
 }