Commit be9600f2 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Adding explicit instantiation of tnlSharedArray.

parent 5cb07ba1

buildAll

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ VERBOSE=1 


CMAKE="cmake"

CPUS=`grep -c processor /proc/cpuinfo`

CPUS=1



echo "Building $TARGET using $CPUS processors."

src/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ ADD_LIBRARY( tnl${debugExt}-${tnlVersion} SHARED 
               ${tnl_config_SOURCES}

               ${tnl_core_SOURCES}

               ${tnl_implementation_SOURCES}

               ${tnl_legacy_SOURCES}

               ${tnl_debug_SOURCES}

               ${tnl_matrix_SOURCES} )

               

SET_TARGET_PROPERTIES( tnl${debugExt}-${tnlVersion} PROPERTIES 

                          SOVERSION 0 

                          VERSION ${tnlVersion} )

src/core/tnlArray.h

+0 −16
Original line number Diff line number Diff line
@@ -121,20 +121,4 @@ class tnlArray : public tnlObject 


#include <implementation/core/tnlArray_impl.h>



#ifdef TEMPLATE_EXPLICIT_INSTANTIATION



extern template class tnlArray< float, tnlHost, int >;

extern template class tnlArray< double, tnlHost, int >;

extern template class tnlArray< float, tnlHost, long int >;

extern template class tnlArray< double, tnlHost, long int >;



#ifdef HAVE_CUDA

extern template class tnlArray< float, tnlCuda, int >;

extern template class tnlArray< double, tnlCuda, int >;

extern template class tnlArray< float, tnlCuda, long int >;

extern template class tnlArray< double, tnlCuda, long int >;

#endif



#endif



#endif /* TNLARRAY_H_ */

src/implementation/core/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ SET( headers cuda-long-vector-kernels.h 
SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/implementation/core )    

set( tnl_implementation_core_SOURCES

     ${CURRENT_DIR}/tnlArray_impl.cpp

     ${CURRENT_DIR}/tnlSharedArray_impl.cpp

     ${CURRENT_DIR}/tnlMultiArray_impl.cpp

     ${CURRENT_DIR}/tnlMultiVector_impl.cpp

     ${CURRENT_DIR}/tnlSharedVector_impl.cpp

src/implementation/core/tnlArray_impl.h

+16 −0
Original line number Diff line number Diff line
@@ -375,4 +375,20 @@ tnlArray< Element, Device, Index > :: ~tnlArray() 


//}; // namespace implementation



#ifdef TEMPLATE_EXPLICIT_INSTANTIATION



extern template class tnlArray< float, tnlHost, int >;

extern template class tnlArray< double, tnlHost, int >;

extern template class tnlArray< float, tnlHost, long int >;

extern template class tnlArray< double, tnlHost, long int >;



#ifdef HAVE_CUDA

extern template class tnlArray< float, tnlCuda, int >;

extern template class tnlArray< double, tnlCuda, int >;

extern template class tnlArray< float, tnlCuda, long int >;

extern template class tnlArray< double, tnlCuda, long int >;

#endif



#endif



#endif /* TNLARRAY_H_IMPLEMENTATION */