make exports headers .h files, python fixes

LLNL · Oct 30, 2016 · 2005fb9 · 2005fb9
1 parent f3dc4cc
commit 2005fb9
Show file tree

Hide file tree

Showing 37 changed files with 88 additions and 57 deletions.
diff --git a/src/libs/blueprint/CMakeLists.txt b/src/libs/blueprint/CMakeLists.txt
@@ -58,7 +58,7 @@ set(blueprint_headers
     conduit_blueprint_mesh_examples.hpp
     conduit_blueprint_mcarray.hpp
     conduit_blueprint_mcarray_examples.hpp
-    conduit_blueprint_exports.hpp
+    conduit_blueprint_exports.h
 )
 
 #
@@ -86,9 +86,9 @@ set(blueprint_sources
 # Specify blueprint c sources
 #
 set(blueprint_c_sources 
-    c/c_conduit_blueprint.cpp
-    c/c_conduit_blueprint_mcarray.cpp
-    c/c_conduit_blueprint_mesh.cpp
+    c/conduit_blueprint_c.cpp
+    c/conduit_blueprint_mcarray_c.cpp
+    c/conduit_blueprint_mesh_c.cpp
     )
 
 

diff --git a/src/libs/blueprint/c/conduit_blueprint.h b/src/libs/blueprint/c/conduit_blueprint.h
@@ -56,7 +56,7 @@
 //-----------------------------------------------------------------------------
 
 #include "conduit.h"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin extern C

diff --git a/src/libs/blueprint/c/c_conduit_blueprint.cpp → src/libs/blueprint/c/conduit_blueprint_c.cpp b/src/libs/blueprint/c/c_conduit_blueprint.cpp → src/libs/blueprint/c/conduit_blueprint_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit_blueprint.cpp
+/// file: conduit_blueprint_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit_blueprint.h"

diff --git a/src/libs/blueprint/c/conduit_blueprint_mcarray.h b/src/libs/blueprint/c/conduit_blueprint_mcarray.h
@@ -56,7 +56,7 @@
 //-----------------------------------------------------------------------------
 
 #include "conduit.h"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin extern C

diff --git a/...ueprint/c/c_conduit_blueprint_mcarray.cpp → ...ueprint/c/conduit_blueprint_mcarray_c.cpp b/...ueprint/c/c_conduit_blueprint_mcarray.cpp → ...ueprint/c/conduit_blueprint_mcarray_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit_blueprint_mcarray.cpp
+/// file: conduit_blueprint_mcarray_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit_blueprint_mcarray.h"

diff --git a/src/libs/blueprint/c/conduit_blueprint_mesh.h b/src/libs/blueprint/c/conduit_blueprint_mesh.h
@@ -56,7 +56,7 @@
 //-----------------------------------------------------------------------------
 
 #include "conduit.h"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin extern C

diff --git a/.../blueprint/c/c_conduit_blueprint_mesh.cpp → .../blueprint/c/conduit_blueprint_mesh_c.cpp b/.../blueprint/c/c_conduit_blueprint_mesh.cpp → .../blueprint/c/conduit_blueprint_mesh_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit_blueprint_mesh.cpp
+/// file: conduit_blueprint_mesh_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit_blueprint_mesh.h"

diff --git a/src/libs/blueprint/conduit_blueprint.hpp b/src/libs/blueprint/conduit_blueprint.hpp
@@ -56,7 +56,7 @@
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
 
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 #include "conduit_blueprint_mesh.hpp"
 #include "conduit_blueprint_mesh_examples.hpp"

diff --git a/...s/blueprint/conduit_blueprint_exports.hpp → ...ibs/blueprint/conduit_blueprint_exports.h b/...s/blueprint/conduit_blueprint_exports.hpp → ...ibs/blueprint/conduit_blueprint_exports.h
@@ -44,12 +44,12 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: conduit_blueprint_exports.hpp
+/// file: conduit_blueprint_exports.h
 ///
 //-----------------------------------------------------------------------------
 
-#ifndef CONDUIT_BLUEPRINT_EXPORTS_HPP
-#define CONDUIT_BLUEPRINT_EXPORTS_HPP
+#ifndef CONDUIT_BLUEPRINT_EXPORTS_H
+#define CONDUIT_BLUEPRINT_EXPORTS_H
 
 //-----------------------------------------------------------------------------
 // -- define proper lib exports for various platforms -- 

diff --git a/src/libs/blueprint/conduit_blueprint_mcarray.hpp b/src/libs/blueprint/conduit_blueprint_mcarray.hpp
@@ -55,7 +55,7 @@
 // conduit lib includes
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 
 //-----------------------------------------------------------------------------

diff --git a/src/libs/blueprint/conduit_blueprint_mcarray_examples.hpp b/src/libs/blueprint/conduit_blueprint_mcarray_examples.hpp
@@ -55,7 +55,7 @@
 // conduit lib includes
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 
 //-----------------------------------------------------------------------------

diff --git a/src/libs/blueprint/conduit_blueprint_mesh.hpp b/src/libs/blueprint/conduit_blueprint_mesh.hpp
@@ -55,7 +55,7 @@
 // conduit lib includes
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin conduit --

diff --git a/src/libs/blueprint/conduit_blueprint_mesh_examples.hpp b/src/libs/blueprint/conduit_blueprint_mesh_examples.hpp
@@ -55,7 +55,7 @@
 // conduit lib includes
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
-#include "conduit_blueprint_exports.hpp"
+#include "conduit_blueprint_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin conduit::--

diff --git a/src/libs/conduit/CMakeLists.txt b/src/libs/conduit/CMakeLists.txt
@@ -76,7 +76,7 @@ set(conduit_headers
     conduit_node_iterator.hpp
     conduit_schema.hpp
     conduit_utils.hpp
-    conduit_exports.hpp
+    conduit_exports.h
     ${CMAKE_CURRENT_BINARY_DIR}/conduit_config.h
     ${CMAKE_CURRENT_BINARY_DIR}/conduit_bitwidth_style_types.h
     )
@@ -110,9 +110,9 @@ set(conduit_sources
 # Specify conduit c interface sources
 #
 set(conduit_c_sources
-    c/c_conduit.cpp
-    c/c_conduit_node.cpp
-    c/c_conduit_cpp_to_c.cpp
+    c/conduit_c.cpp
+    c/conduit_node_c.cpp
+    c/conduit_cpp_to_c.cpp
     )
 
 

diff --git a/src/libs/conduit/c/c_conduit.cpp → src/libs/conduit/c/conduit_c.cpp b/src/libs/conduit/c/c_conduit.cpp → src/libs/conduit/c/conduit_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit.cpp
+/// file: conduit_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit.h"

diff --git a/src/libs/conduit/c/c_conduit_cpp_to_c.cpp → src/libs/conduit/c/conduit_cpp_to_c.cpp b/src/libs/conduit/c/c_conduit_cpp_to_c.cpp → src/libs/conduit/c/conduit_cpp_to_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit_cpp_to_c.cpp
+/// file: conduit_cpp_to_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit.h"

diff --git a/src/libs/conduit/c/conduit_node.h b/src/libs/conduit/c/conduit_node.h
@@ -57,7 +57,7 @@
 
 #include "conduit_bitwidth_style_types.h"
 #include "conduit_endianness_types.h"
-#include "conduit_exports.hpp"
+#include "conduit_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- begin extern C

diff --git a/src/libs/conduit/c/c_conduit_node.cpp → src/libs/conduit/c/conduit_node_c.cpp b/src/libs/conduit/c/c_conduit_node.cpp → src/libs/conduit/c/conduit_node_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: conduit_node.cpp
+/// file: conduit_node_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit_node.h"

diff --git a/src/libs/conduit/conduit_core.hpp b/src/libs/conduit/conduit_core.hpp
@@ -65,7 +65,7 @@
 //-----------------------------------------------------------------------------
 // -- define proper lib exports for various platforms -- 
 //-----------------------------------------------------------------------------
-#include "conduit_exports.hpp"
+#include "conduit_exports.h"
 
 //-----------------------------------------------------------------------------
 // -- include bit width style types mapping header  -- 

diff --git a/src/libs/conduit/conduit_exports.hpp → src/libs/conduit/conduit_exports.h b/src/libs/conduit/conduit_exports.hpp → src/libs/conduit/conduit_exports.h
@@ -44,12 +44,12 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: conduit_exports.hpp
+/// file: conduit_exports.h
 ///
 //-----------------------------------------------------------------------------
 
-#ifndef CONDUIT_EXPORTS_HPP
-#define CONDUIT_EXPORTS_HPP
+#ifndef CONDUIT_EXPORTS_H
+#define CONDUIT_EXPORTS_H
 
 //-----------------------------------------------------------------------------
 // -- define proper lib exports for various platforms -- 

diff --git a/src/libs/conduit/python/conduit_python.cpp b/src/libs/conduit/python/conduit_python.cpp
@@ -54,6 +54,16 @@
 #define IS_PY3K
 #endif
 
+//-----------------------------------------------------------------------------
+// PyVarObject_TAIL is used at the end of each PyVarObject def
+// to make sure we have the correct number of initializers across python
+// versions.
+//-----------------------------------------------------------------------------
+#ifdef Py_TPFLAGS_HAVE_FINALIZE
+#define PyVarObject_TAIL ,0
+#else
+#define PyVarObject_TAIL
+#endif
 
 //-----------------------------------------------------------------------------
 // -- standard lib includes -- 
@@ -73,7 +83,7 @@
 // conduit includes
 //---------------------------------------------------------------------------//
 #include "conduit.hpp"
-#include "Conduit_Python_Exports.hpp"
+#include "conduit_python_exports.hpp"
 
 #define CONDUIT_MODULE
 #include "conduit_python.hpp"
@@ -1922,6 +1932,7 @@ static PyTypeObject PyConduit_DataType_TYPE = {
    0,  /* tp_weaklist */
    0,
    0
+   PyVarObject_TAIL
 };
 
 //---------------------------------------------------------------------------//
@@ -2189,6 +2200,7 @@ static PyTypeObject PyConduit_Generator_TYPE = {
    0,  /* tp_weaklist */
    0,
    0
+   PyVarObject_TAIL
 };
 
 
@@ -2611,6 +2623,7 @@ static PyTypeObject PyConduit_Schema_TYPE = {
    0,  /* tp_weaklist */
    0,
    0
+   PyVarObject_TAIL
 };
 
 
@@ -2973,6 +2986,7 @@ static PyTypeObject PyConduit_NodeIterator_TYPE = {
    0,  /* tp_weaklist */
    0,
    0
+   PyVarObject_TAIL       
 };
 
 //---------------------------------------------------------------------------//
@@ -4015,6 +4029,7 @@ static PyTypeObject PyConduit_Node_TYPE = {
    0,  /* tp_weaklist */
    0,
    0
+   PyVarObject_TAIL
 };
 
 

diff --git a/src/libs/relay/CMakeLists.txt b/src/libs/relay/CMakeLists.txt
@@ -67,8 +67,8 @@ endif()
 
 set(CONDUIT_RELAY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/conduit_relay_config.hpp.in"
-                "${CMAKE_CURRENT_BINARY_DIR}/conduit_relay_config.hpp")
+configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/conduit_relay_config.h.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/conduit_relay_config.h")
 
 #
 # Specify cpp headers
@@ -78,8 +78,8 @@ set(conduit_relay_headers
     conduit_relay_io.hpp
     conduit_relay_web.hpp
     conduit_relay_web_node_viewer_server.hpp
-    conduit_relay_exports.hpp
-    ${CMAKE_CURRENT_BINARY_DIR}/conduit_relay_config.hpp)
+    conduit_relay_exports.h
+    ${CMAKE_CURRENT_BINARY_DIR}/conduit_relay_config.h)
 
 #
 # Specify c headers
@@ -100,7 +100,7 @@ set(conduit_relay_sources
 # Specify c sources
 #
 set(conduit_relay_c_sources
-    c/c_conduit_relay.cpp)
+    c/conduit_relay_c.cpp)
 
 
 if(HDF5_FOUND)
@@ -204,7 +204,7 @@ if(MPI_FOUND)
 #
 set(conduit_relay_mpi_headers
     conduit_relay_mpi.hpp
-    conduit_relay_exports.hpp)
+    conduit_relay_exports.h)
 
 #
 # Specify relay mpi sources

diff --git a/src/libs/relay/c/conduit_relay.h b/src/libs/relay/c/conduit_relay.h
@@ -56,7 +56,9 @@
 //-----------------------------------------------------------------------------
 
 #include "conduit.h"
-#include "conduit_relay_exports.hpp"
+#include "conduit_relay_config.h"
+#include "conduit_relay_exports.h"
+
 
 //-----------------------------------------------------------------------------
 // -- begin extern C

diff --git a/src/libs/relay/c/c_conduit_relay.cpp → src/libs/relay/c/conduit_relay_c.cpp b/src/libs/relay/c/c_conduit_relay.cpp → src/libs/relay/c/conduit_relay_c.cpp
@@ -44,7 +44,7 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: c_conduit_relay.cpp
+/// file: conduit_relay_c.cpp
 ///
 //-----------------------------------------------------------------------------
 #include "conduit_relay.h"

diff --git a/src/libs/relay/conduit_relay.hpp b/src/libs/relay/conduit_relay.hpp
@@ -57,8 +57,8 @@
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
 
-#include "conduit_relay_exports.hpp"
-#include "conduit_relay_config.hpp"
+#include "conduit_relay_exports.h"
+#include "conduit_relay_config.h"
 
 #include "conduit_relay_io.hpp"
 #include "conduit_relay_web.hpp"

diff --git a/src/libs/relay/conduit_relay_config.hpp.in → src/libs/relay/conduit_relay_config.h.in b/src/libs/relay/conduit_relay_config.hpp.in → src/libs/relay/conduit_relay_config.h.in
@@ -44,12 +44,12 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: conduit_relay_config.hpp
+/// file: conduit_relay_config.h
 ///
 //-----------------------------------------------------------------------------
 
-#ifndef CONDUIT_RELAY_CONFIG_HPP
-#define CONDUIT_RELAY_CONFIG_HPP
+#ifndef CONDUIT_RELAY_CONFIG_H
+#define CONDUIT_RELAY_CONFIG_H
 
 //-----------------------------------------------------------------------------
 //

diff --git a/src/libs/relay/conduit_relay_exports.hpp → src/libs/relay/conduit_relay_exports.h b/src/libs/relay/conduit_relay_exports.hpp → src/libs/relay/conduit_relay_exports.h
@@ -44,12 +44,12 @@
 
 //-----------------------------------------------------------------------------
 ///
-/// file: conduit_relay_exports.hpp
+/// file: conduit_relay_exports.h
 ///
 //-----------------------------------------------------------------------------
 
-#ifndef CONDUIT_RELAY_EXPORTS_HPP
-#define CONDUIT_RELAY_EXPORTS_HPP
+#ifndef CONDUIT_RELAY_EXPORTS_H
+#define CONDUIT_RELAY_EXPORTS_H
 
 //-----------------------------------------------------------------------------
 // -- define proper lib exports for various platforms -- 

diff --git a/src/libs/relay/conduit_relay_io.hpp b/src/libs/relay/conduit_relay_io.hpp
@@ -56,8 +56,8 @@
 // conduit lib include 
 //-----------------------------------------------------------------------------
 #include "conduit.hpp"
-#include "conduit_relay_exports.hpp"
-#include "conduit_relay_config.hpp"
+#include "conduit_relay_exports.h"
+#include "conduit_relay_config.h"
 
 //-----------------------------------------------------------------------------
 // -- begin conduit:: --