Merge remote-tracking branch 'upstream/master'

Adding complements to use Texture and Surfaces 2D Layered
inducer · Mar 11, 2016 · 88c4bed · 88c4bed
2 parents a14bf90 + 2b16d1c
commit 88c4bed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/doc/source/misc.rst b/doc/source/misc.rst
@@ -1,14 +1,24 @@
 Changes
 =======
 
-Version 2014.1
+Version 2016.2
 --------------
-
 .. note::
 
     This version is the current development version. You can get it from
     `PyCUDA's version control repository <https://github.com/inducer/pycuda>`_.
 
+Version 2016.1
+--------------
+
+* Bug fixes.
+* Global control of caching.
+* Matrix/array interop.
+* Add :meth:`pycuda.gpuarray.GPUArray.squeeze`
+
+Version 2014.1
+--------------
+
 * Add :meth:`PointerHolderBase.as_buffer` and :meth:`DeviceAllocation.as_buffer`.
 * Support for :class:`device_attribute` values added in CUDA 5.0, 5.5, and 6.0.
 * Support for :ref:`managed_memory`. (contributed by Stan Seibert)

diff --git a/examples/download-examples-from-wiki.py b/examples/download-examples-from-wiki.py
@@ -6,7 +6,7 @@
 except:
     import xmlrpc.client as xmlrpclib
 
-destwiki = six.moves.xmlrpc_client.ServerProxy("http://wiki.tiker.net?action=xmlrpc2")
+destwiki = six.moves.xmlrpc_client.ServerProxy("https://wiki.tiker.net?action=xmlrpc2")
 
 import os
 try:

diff --git a/pycuda/__init__.py b/pycuda/__init__.py
@@ -1,3 +1,3 @@
-VERSION = (2015, 1, 3)
+VERSION = (2016, 1)
 VERSION_STATUS = ""
 VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS