[97793] trunk/dports/python/py-pyopencl
stromnov at macports.org
stromnov at macports.org
Sat Sep 15 14:21:31 PDT 2012
Revision: 97793
http://trac.macports.org//changeset/97793
Author: stromnov at macports.org
Date: 2012-09-15 14:21:31 -0700 (Sat, 15 Sep 2012)
Log Message:
-----------
py-pyopencl: update to version 2012.1 (#35437)
Modified Paths:
--------------
trunk/dports/python/py-pyopencl/Portfile
trunk/dports/python/py-pyopencl/files/patch-setup.py.diff
Added Paths:
-----------
trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff
trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff
Modified: trunk/dports/python/py-pyopencl/Portfile
===================================================================
--- trunk/dports/python/py-pyopencl/Portfile 2012-09-15 20:28:31 UTC (rev 97792)
+++ trunk/dports/python/py-pyopencl/Portfile 2012-09-15 21:21:31 UTC (rev 97793)
@@ -5,14 +5,15 @@
PortGroup python 1.0
name py-pyopencl
-version 2011.2
-revision 2
+version 2012.1
+revision 0
python.versions 26 27
python.default_version 27
categories-append science
+license MIT
+platforms darwin
maintainers gmail.com:larry.velazquez openmaintainer
-license MIT
description Python wrapper for OpenCL.
@@ -20,21 +21,21 @@
other massively parallel compute \
devices from Python.
-platforms darwin
+homepage http://mathema.tician.de/software/pyopencl
+master_sites http://pypi.python.org/packages/source/p/pyopencl/
-if {${configure.compiler} == "clang"} {
- configure.compiler llvm-gcc-4.2
-}
-
-homepage http://mathema.tician.de/software/pyopencl
-master_sites http://cheeseshop.python.org/packages/source/p/pyopencl/
distname pyopencl-${version}
-checksums rmd160 78ec633e9e14b4df484051a728119f47a14f29a0 \
- sha256 44e63472cfd3783e60c4c5a7f0ae3537fb95ffd6034ca3db226f5ca5a726d9b9
+checksums rmd160 bd4f5776ee7bd5393a8a46b4682d1e757372cc38 \
+ sha256 823c9af3540ab84221acf7978bf688d98c7635e19d6bdb4d6818c48235184297
-patchfiles patch-setup.py.diff
+patch.pre_args -p1
+patchfiles patch-setup.py.diff \
+ patch-aksetup_helper.py.diff \
+ patch-clCreateProgramWithBuiltInKernels.diff
+compiler.blacklist clang
+
if {${subport} != ${name}} {
depends_build-append \
port:py${python.version}-distribute \
Added: trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff
===================================================================
--- trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff (rev 0)
+++ trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff 2012-09-15 21:21:31 UTC (rev 97793)
@@ -0,0 +1,38 @@
+From 7f7fa90c69781616ee448778e65336e368670452 Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform at tiker.net>
+Date: Wed, 1 Aug 2012 01:39:17 -0400
+Subject: [PATCH 1/1] Update aksetup to preserve commas in StringListOption defaults.
+
+---
+ aksetup_helper.py | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/aksetup_helper.py b/aksetup_helper.py
+index cafdad6..12953df 100644
+--- a/aksetup_helper.py
++++ b/aksetup_helper.py
+@@ -486,7 +486,7 @@ class StringListOption(Option):
+ if default is None:
+ return None
+
+- return ",".join([str(el) for el in default])
++ return ",".join([str(el).replace(",", r"\,") for el in default])
+
+ def get_help(self, default):
+ return Option.get_help(self, default) + " (several ok)"
+@@ -497,7 +497,11 @@ class StringListOption(Option):
+ return None
+ else:
+ if opt:
+- return opt.split(",")
++ import re
++ sep = re.compile(r"(?<!\\),")
++ result = sep.split(opt)
++ result = [i.replace(r"\,", ",") for i in result]
++ return result
+ else:
+ return []
+
+--
+1.7.2.5
+
Added: trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff
===================================================================
--- trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff (rev 0)
+++ trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff 2012-09-15 21:21:31 UTC (rev 97793)
@@ -0,0 +1,54 @@
+From a6294d0b7a0bae75c67598426b0b2264b018c2cb Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform at tiker.net>
+Date: Sat, 28 Jul 2012 16:18:52 -0400
+Subject: [PATCH 1/1] Don't expose clCreateProgramWithBuiltInKernels on Apple CL 1.2.
+
+(reported by Bogdan Opanchuk)
+---
+ src/wrapper/wrap_cl.hpp | 5 ++++-
+ src/wrapper/wrap_cl_part_2.cpp | 3 ++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/wrapper/wrap_cl.hpp b/src/wrapper/wrap_cl.hpp
+index 90c9a3f..9efedf7 100644
+--- a/src/wrapper/wrap_cl.hpp
++++ b/src/wrapper/wrap_cl.hpp
+@@ -3006,7 +3006,8 @@ namespace pyopencl
+
+
+
+-#if PYOPENCL_CL_VERSION >= 0x1020
++#if (PYOPENCL_CL_VERSION >= 0x1020) && \
++ ((PYOPENCL_CL_VERSION >= 0x1030) && defined(__APPLE__))
+ inline
+ program *create_program_with_built_in_kernels(
+ context &ctx,
+@@ -3033,9 +3034,11 @@ namespace pyopencl
+ throw;
+ }
+ }
++#endif
+
+
+
++#if PYOPENCL_CL_VERSION >= 0x1020
+ inline
+ program *link_program(
+ context &ctx,
+diff --git a/src/wrapper/wrap_cl_part_2.cpp b/src/wrapper/wrap_cl_part_2.cpp
+index 3205c2e..cc7942c 100644
+--- a/src/wrapper/wrap_cl_part_2.cpp
++++ b/src/wrapper/wrap_cl_part_2.cpp
+@@ -196,7 +196,8 @@ void pyopencl_expose_part_2()
+ create_program_with_binary,
+ py::default_call_policies(),
+ py::args("context", "devices", "binaries")))
+-#if PYOPENCL_CL_VERSION >= 0x1020
++#if (PYOPENCL_CL_VERSION >= 0x1020) && \
++ ((PYOPENCL_CL_VERSION >= 0x1030) && defined(__APPLE__))
+ .def("create_with_built_in_kernels",
+ create_program_with_built_in_kernels,
+ py::args("context", "devices", "kernel_names"),
+--
+1.7.2.5
+
Modified: trunk/dports/python/py-pyopencl/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-pyopencl/files/patch-setup.py.diff 2012-09-15 20:28:31 UTC (rev 97792)
+++ trunk/dports/python/py-pyopencl/files/patch-setup.py.diff 2012-09-15 21:21:31 UTC (rev 97793)
@@ -1,11 +1,9 @@
---- setup.py.orig 2011-11-19 20:48:45.000000000 -0500
-+++ setup.py 2012-03-20 14:31:50.000000000 -0400
-@@ -15,8 +15,7 @@
- osx_ver = float('.'.join(osx_ver.split('.')[:2]))
+--- pyopencl-2012.1/setup.py.orig 2012-06-02 16:23:51.000000000 -0400
++++ pyopencl-2012.1/setup.py 2012-08-28 23:27:29.000000000 -0400
+@@ -28,6 +28,7 @@
+ default_cxxflags.extend(['-isysroot', srp])
+ break
- default_libs = []
-- default_cxxflags = ['-arch', 'i386', '-arch', 'x86_64',
-- '-isysroot', '/Developer/SDKs/MacOSX%s.sdk' % osx_ver]
+ default_cxxflags = []
default_ldflags = default_cxxflags[:] + ["-Wl,-framework,OpenCL"]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120915/0b624225/attachment.html>
More information about the macports-changes
mailing list