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

Fixing tnl-compile and tnl-link scripts.

parent 9aaa1504

CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ if( WITH_CUDA STREQUAL "yes" ) 
                ####

                # Select GPU architecture

                #

                set( CUDA_ARCH_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/cuda-arch-options)

                set( CUDA_ARCH_SOURCE ${PROJECT_SOURCE_DIR}/tools/src/cuda-arch-options.cu)

                message( "Compiling device-arch-options ..." )

                set( CUDA_ARCH_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/tnl-cuda-arch)

                set( CUDA_ARCH_SOURCE ${PROJECT_SOURCE_DIR}/tools/src/tnl-cuda-arch.cu)

                message( "Compiling tnl-cuda-arch ..." )

                file( MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} )

                execute_process( COMMAND nvcc ${CUDA_ARCH_SOURCE} -o ${CUDA_ARCH_EXECUTABLE}

                                 RESULT_VARIABLE CUDA_ARCH_RESULT

src/core/arrays/tnlArray_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ extern template class tnlArray< float, tnlHost, int >; 
#endif

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

#ifdef INSTANTIATE_LONG_DOUBLE

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

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

#endif



#ifdef INSTANTIATE_LONG_INT
@@ -438,7 +438,7 @@ extern template class tnlArray< float, tnlHost, long int >; 
#endif

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

#ifdef INSTANTIATE_LONG_DOUBLE

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

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

#endif

#endif

src/core/arrays/tnlSharedArray_impl.cpp

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ template class tnlSharedArray< float, tnlHost, int >; 
#endif

template class tnlSharedArray< double, tnlHost, int >;

#ifdef INSTANTIATE_LONG_DOUBLE

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

template class tnlSharedArray< long double, tnlHost, int >;

#endif



#ifdef INSTANTIATE_LONG_INT
@@ -32,17 +32,17 @@ template class tnlSharedArray< float, tnlHost, long int >; 
#endif

template class tnlSharedArray< double, tnlHost, long int >;

#ifdef INSTANTIATE_LONG_DOUBLE

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

template class tnlSharedArray< long double, tnlHost, long int >;

#endif

#endif



#ifdef HAVE_CUDA

/*#ifdef HAVE_CUDA

#ifdef INSTANTIATE_FLOAT

template class tnlSharedArray< float, tnlCuda, int >;

#endif

template class tnlSharedArray< double, tnlCuda, int >;

#ifdef INSTANTIATE_LONG_DOUBLE

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

template class tnlSharedArray< long double, tnlCuda, int >;

#endif



#ifdef INSTANTIATE_LONG_INT
@@ -51,10 +51,10 @@ template class tnlSharedArray< float, tnlCuda, long int >; 
#endif

template class tnlSharedArray< double, tnlCuda, long int >;

#ifdef INSTANTIATE_LONG_DOUBLE

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

#endif

template class tnlSharedArray< long double, tnlCuda, long int >;

#endif

#endif

#endif*/



#endif

tools/src/CMakeLists.txt

+11 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ target_link_libraries( tnl-functions-benchmark${debugExt} tnl${debugExt}-${tnlVe 
ADD_EXECUTABLE(tnl-curve2gnuplot${debugExt} ${tnlcurve2gnuplotsources})

target_link_libraries (tnl-curve2gnuplot${debugExt} tnl${debugExt}-${tnlVersion} )



IF( BUILD_CUDA )

    CUDA_ADD_EXECUTABLE( tnl-cuda-arch${debugExt} tnl-cuda-arch.cu

                         OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

    SET_TARGET_PROPERTIES( tnl-cuda-arch${debugExt} PROPERTIES CUDA_COMPILE_FLAGS "${CXX_OPTIMIZE_FLAGS}" )

ENDIF()

#ADD_EXECUTABLE( tnl-matrix-convert${debugExt} ${tnlmatrixconvertsources} )

#target_link_libraries( tnl-matrix-convert${debugExt} tnl${debugExt}-${tnlVersion} )
@@ -56,6 +61,12 @@ INSTALL( TARGETS tnl-init${debugExt} 
         RUNTIME DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

         

IF( BUILD_CUDA )

   INSTALL( TARGETS tnl-cuda-arch${debugExt}

            RUNTIME DESTINATION bin

            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

ENDIF()



INSTALL( FILES tnl-err2eoc

               tnl-time-series2png

               tnl-eoc-test-log