Mercurial > pytave

changeset 412:db29823a8919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop initialization of NumPy C API, no longer used * oct-py-init.cc: Remove call to NumPy _import_array and related #includes. * arrayobjectdefs.h: Delete. * Makefile.am (PYTAVE_HEADER_FILES): Remove arrayobjectdefs.h from the list.
author Mike Miller <mtmiller@octave.org>
date Wed, 03 May 2017 16:37:51 -0700
parents 3613ffbd52b2
children 4f415a887ff8
files Makefile.am arrayobjectdefs.h oct-py-init.cc
diffstat 3 files changed, 0 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Wed May 03 16:30:45 2017 -0700
+++ b/Makefile.am	Wed May 03 16:37:51 2017 -0700
@@ -63,7 +63,6 @@
 OCT_SOURCE_FILES = $(patsubst %.oct, %.cc, $(OCT_FILES))
 
 PYTAVE_HEADER_FILES = \
-  arrayobjectdefs.h \
   config.h \
   exceptions.h \
   oct-py-eval.h \
--- a/arrayobjectdefs.h	Wed May 03 16:30:45 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-
-Copyright (C) 2015-2016 Mike Miller
-Copyright (C) 2008 David Grundberg, Håkan Fors Nilsson
-
-This file is part of Pytave.
-
-Pytave is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 3 of the License, or (at your
-option) any later version.
-
-Pytave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Pytave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#if ! defined (pytave_arrayobjectdefs_h)
-#define pytave_arrayobjectdefs_h 1
-
-// If your extension does not reside in a single file, there is an
-// additional step that is necessary. Be sure to define the symbol
-// PY_ARRAY_UNIQUE_SYMBOL to some name (the same name in all the files
-// comprising the extension), upstream from the include of
-// arrayobject.h. Typically this would be in some header file that is
-// included before arrayobject.h.
-
-#if ! defined (PYTAVE_DO_DECLARE_SYMBOL)
-#  define NO_IMPORT_ARRAY
-#endif
-
-#define PY_ARRAY_UNIQUE_SYMBOL pytave_array_symbol
-
-#include <Python.h>
-#include <numpy/npy_no_deprecated_api.h>
-#include <numpy/arrayobject.h>
-
-#endif
--- a/oct-py-init.cc	Wed May 03 16:30:45 2017 -0700
+++ b/oct-py-init.cc	Wed May 03 16:37:51 2017 -0700
@@ -28,12 +28,6 @@
 
 #include "oct-py-init.h"
 
-// FIXME: the following are only needed for Boost.Python library and NumPy
-// library initialization
-#define PYTAVE_DO_DECLARE_SYMBOL
-#include <boost/python.hpp>
-#include "arrayobjectdefs.h"
-
 namespace pytave
 {
 
@@ -52,9 +46,6 @@
 
     if (! is_initialized)
       PySys_SetArgvEx (1, sys_argv, 0);
-
-    // FIXME: this is needed for use of NumPy array object C API
-    _import_array ();
   }
 
 }