Moved stuff from Config.py into __init__.py (120d3573) · Commits · TNL / tnl-dev

CMakeLists.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -306,8 +306,6 @@ if( WITH_TESTS STREQUAL "yes" )
		endif()
		endif( WITH_TESTS STREQUAL "yes" )

		find_package( PythonInterp 3 )

		#if( BUILD_MPI )
		# FIND_PATH( PETSC_INCLUDE_DIR petsc.h
		# /usr/include/petsc
		@@ -369,10 +367,6 @@ set( sourceDirectory \"${PROJECT_SOURCE_DIR}/\" )
		set( testsDirectory \"${PROJECT_TESTS_PATH}/\" )
		CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION include/tnl-${tnlVersion}/TNL )
		if( PYTHONINTERP_FOUND )
		CONFIGURE_FILE( "Config.py.in" "${PROJECT_BUILD_PATH}/TNL/Config.py" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/Config.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/TNL )
		endif( PYTHONINTERP_FOUND )

		#Nastavime cesty k hlavickovym souborum a knihovnam
		INCLUDE_DIRECTORIES( src )

src/Python/CMakeLists.txt

+7 −2

Original line number	Diff line number	Diff line
		INSTALL( FILES __init__.py
		find_package( PythonInterp 3 )

		if( PYTHONINTERP_FOUND )
		CONFIGURE_FILE( "__init__.py.in" "${PROJECT_BUILD_PATH}/Python/__init__.py" )
		INSTALL( FILES ${PROJECT_BUILD_PATH}/Python/__init__.py
		DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/TNL )
		endif()

src/Python/init.py

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line

src/Python/init.py.in

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		__install_prefix__ = "@CMAKE_INSTALL_PREFIX@"
		__version__ = "@tnlVersion@"

src/Tools/tnl-quickstart/tnl-quickstart.py

+16 −16

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		__author__ = "Tomas Oberhuber"
		__date__ = "$May 6, 2015 8:40:59 PM$"

		import TNL.Config
		import TNL

		def generateRunScript( problemBaseName ):
		file = open( "run-" + problemBaseName, "w" )
		@@ -25,7 +25,7 @@ definitions['operatorName'] = input( "Operator name:")
		####
		# Makefile
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/Makefile.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/Makefile.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( "Makefile", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -33,17 +33,17 @@ with open( "Makefile", 'w') as file:
		####
		# Main files
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/main.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/main.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName']+".h", 'w') as file:
		file.write( templateString.format(**definitions ) )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/main.cu.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/main.cu.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName']+"-cuda.cu", 'w') as file:
		file.write( templateString.format(**definitions ) )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/main.cpp.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/main.cpp.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName']+".cpp", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -51,12 +51,12 @@ with open( definitions['problemBaseName']+".cpp", 'w') as file:
		####
		# Problem definition
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/problem.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/problem.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName'] + "Problem.h", 'w') as file:
		file.write( templateString.format(**definitions ) )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/problem_impl.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/problem_impl.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName'] + "Problem_impl.h", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -68,26 +68,26 @@ dimensions = [ '1', '2', '3' ]
		for meshDimension in dimensions:
		definitions[ 'meshDimension' ] = meshDimension
		key = 'operatorGridSpecializationHeader_' + meshDimension + 'D'
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/operator-grid-specialization.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/operator-grid-specialization.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		definitions[ key ] = templateString.format( **definitions )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/explicit-laplace-grid-" + meshDimension + "d_impl.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/explicit-laplace-grid-" + meshDimension + "d_impl.h.in", 'r') as ftemp:
		definitions[ 'explicitScheme' ] = ftemp.read();
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/implicit-laplace-grid-" + meshDimension + "d_impl.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/implicit-laplace-grid-" + meshDimension + "d_impl.h.in", 'r') as ftemp:
		definitions[ 'semiimplicitScheme' ] = ftemp.read();

		key = 'operatorGridSpecializationImplementation_' + meshDimension + 'D'
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/operator-grid-specialization_impl.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/operator-grid-specialization_impl.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		definitions[ key ] = templateString.format( **definitions )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/operator.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/operator.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['operatorName'] + ".h", 'w') as file:
		file.write( templateString.format(**definitions ) )

		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/operator_impl.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/operator_impl.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['operatorName'] + "_impl.h", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -95,7 +95,7 @@ with open( definitions['operatorName'] + "_impl.h", 'w') as file:
		####
		# Right-hand side
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/rhs.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/rhs.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName'] + "Rhs.h", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -103,7 +103,7 @@ with open( definitions['problemBaseName'] + "Rhs.h", 'w') as file:
		####
		# Build config tag
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/build-config-tag.h.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/build-config-tag.h.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( definitions['problemBaseName'] + "BuildConfigTag.h", 'w') as file:
		file.write( templateString.format(**definitions ) )
		@@ -111,7 +111,7 @@ with open( definitions['problemBaseName'] + "BuildConfigTag.h", 'w') as file:
		####
		# Run script
		#
		with open( TNL.Config.tnl_install_prefix+"/share/tnl-" + TNL.Config.tnl_version + "/run-script.in", 'r') as ftemp:
		with open( TNL.__install_prefix__+"/share/tnl-" + TNL.__version__ + "/run-script.in", 'r') as ftemp:
		templateString = ftemp.read()
		with open( "run-" + definitions['problemBaseName'], 'w') as file:
		file.write( templateString.format(**definitions ) )