Index: c/_gpaw.c
===================================================================
--- c/_gpaw.c (revision 11461)
+++ c/_gpaw.c (working copy)
@@ -8,7 +8,7 @@
#include <numpy/arrayobject.h>
#ifdef GPAW_WITH_HDF5
-PyMODINIT_FUNC init_hdf5(void);
+PyMODINIT_FUNC init_gpaw_hdf5(void);
#endif
#ifdef GPAW_HPM
@@ -383,7 +383,7 @@
Py_INCREF(&lxcXCFunctionalType);
#ifdef GPAW_WITH_HDF5
- init_hdf5();
+ init_gpaw_hdf5();
#endif
import_array1(-1);
MPI_Barrier(MPI_COMM_WORLD);
Index: c/hdf5.c
===================================================================
--- c/hdf5.c (revision 11461)
+++ c/hdf5.c (working copy)
@@ -672,9 +672,9 @@
{0, 0, 0, 0}
};
-PyMODINIT_FUNC init_hdf5(void)
+PyMODINIT_FUNC init_gpaw_hdf5(void)
{
- PyObject *m = Py_InitModule("_hdf5",functions);
+ PyObject *m = Py_InitModule("_gpaw_hdf5",functions);
// Set some hdf5 constants as attributes
PyModule_AddIntConstant(m, "H5T_FLOAT", H5T_FLOAT);
PyModule_AddIntConstant(m, "H5T_INTEGER", H5T_INTEGER);
Index: gpaw/io/hdf5_highlevel.py
===================================================================
--- gpaw/io/hdf5_highlevel.py (revision 11461)
+++ gpaw/io/hdf5_highlevel.py (working copy)
@@ -7,7 +7,7 @@
# h5py code is used directly except where explicitly noted
import numpy as np
-from _hdf5 import *
+from _gpaw_hdf5 import *
def numpy_type_from_h5(datatype):
"""Simple conversion from HDF5 datatype to NumPy dtype"""
Index: gpaw/test/Al2_lrtddft.py
===================================================================
--- gpaw/test/Al2_lrtddft.py (revision 11461)
+++ gpaw/test/Al2_lrtddft.py (working copy)
@@ -11,7 +11,7 @@
use_hdf5 = True
try:
- import _hdf5
+ import _gpaw_hdf5
restart_file = 'Al2_gs.hdf5'
except ImportError:
restart_file = 'Al2_gs.gpw'
Index: gpaw/test/__init__.py
===================================================================
--- gpaw/test/__init__.py (revision 11461)
+++ gpaw/test/__init__.py (working copy)
@@ -520,7 +520,7 @@
raise
except ImportError, ex:
module = ex.args[0].split()[-1].split('.')[0]
- if module in ['scipy', 'cmr', '_hdf5']:
+ if module in ['scipy', 'cmr', '_gpaw_hdf5']:
skip = True
else:
failed = True
Index: gpaw/test/fermilevel.py
===================================================================
--- gpaw/test/fermilevel.py (revision 11461)
+++ gpaw/test/fermilevel.py (working copy)
@@ -6,7 +6,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: gpaw/test/fermisplit.py
===================================================================
--- gpaw/test/fermisplit.py (revision 11461)
+++ gpaw/test/fermisplit.py (working copy)
@@ -10,7 +10,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: gpaw/test/fileio/file_reference.py
===================================================================
--- gpaw/test/fileio/file_reference.py (revision 11461)
+++ gpaw/test/fileio/file_reference.py (working copy)
@@ -10,7 +10,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: gpaw/test/fileio/parallel.py
===================================================================
--- gpaw/test/fileio/parallel.py (revision 11461)
+++ gpaw/test/fileio/parallel.py (working copy)
@@ -6,7 +6,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: gpaw/test/fileio/restart_density.py
===================================================================
--- gpaw/test/fileio/restart_density.py (revision 11461)
+++ gpaw/test/fileio/restart_density.py (working copy)
@@ -7,7 +7,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: gpaw/test/refine.py
===================================================================
--- gpaw/test/refine.py (revision 11461)
+++ gpaw/test/refine.py (working copy)
@@ -8,7 +8,7 @@
##endings = ['nc']
endings = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
endings.append('hdf5')
except ImportError:
pass
Index: gpaw/test/restart.py
===================================================================
--- gpaw/test/restart.py (revision 11461)
+++ gpaw/test/restart.py (working copy)
@@ -7,7 +7,7 @@
modes = ['gpw']
try:
- import _hdf5
+ import _gpaw_hdf5
modes.append('hdf5')
except ImportError:
pass
Index: setup.py
===================================================================
--- setup.py (revision 11461)
+++ setup.py (working copy)
@@ -209,7 +209,7 @@
get_hdf5_config(define_macros)
msg.append('* Compiling with HDF5')
- hdf5_extension = Extension('_hdf5',
+ hdf5_extension = Extension('_gpaw_hdf5',
hdf5_sources,
libraries=libraries,
library_dirs=library_dirs,