Moved stuff from Host.cpp to Host.h (08b12e35) · Commits · TNL / tnl-dev

src/TNL/Devices/CMakeLists.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ set (headers Cuda.h

		SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/TNL/Devices )
		set( common_SOURCES
		${CURRENT_DIR}/Host.cpp
		${CURRENT_DIR}/MIC.cpp
		${CURRENT_DIR}/SystemInfo.cpp )

src/TNL/Devices/Host.cpp

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		/***************************************************************************
		Host.cpp - description
		-------------------
		begin : Nov 7, 2012
		copyright : (C) 2012 by Tomas Oberhuber
		email : tomas.oberhuber@fjfi.cvut.cz
		***************************************************************************/

		/* See Copyright Notice in tnl/Copyright */

		#ifdef HAVE_OPENMP
		#include <omp.h>
		#endif

		#include <TNL/Devices/Host.h>
		#include <TNL/Config/ConfigDescription.h>
		#include <TNL/Config/ParameterContainer.h>

		namespace TNL {
		namespace Devices {

		bool Host::ompEnabled( true );
		int Host::maxThreadsCount( -1 );

		String Host::getDeviceType()
		{
		return String( "Devices::Host" );
		};

		void Host::enableOMP()
		{
		ompEnabled = true;
		}

		void Host::disableOMP()
		{
		ompEnabled = false;
		}

		void Host::setMaxThreadsCount( int maxThreadsCount_ )
		{
		maxThreadsCount = maxThreadsCount_;
		#ifdef HAVE_OPENMP
		omp_set_num_threads( maxThreadsCount );
		#endif
		}

		int Host::getMaxThreadsCount()
		{
		#ifdef HAVE_OPENMP
		if( maxThreadsCount == -1 )
		return omp_get_max_threads();
		return maxThreadsCount;
		#else
		return 0;
		#endif
		}

		int Host::getThreadIdx()
		{
		#ifdef HAVE_OPENMP
		return omp_get_thread_num();
		#else
		return 0;
		#endif
		}

		void Host::configSetup( Config::ConfigDescription& config, const String& prefix )
		{
		#ifdef HAVE_OPENMP
		config.addEntry< bool >( prefix + "openmp-enabled", "Enable support of OpenMP.", true );
		config.addEntry< int >( prefix + "openmp-max-threads", "Set maximum number of OpenMP threads.", omp_get_max_threads() );
		#else
		config.addEntry< bool >( prefix + "openmp-enabled", "Enable support of OpenMP (not supported on this system).", false );
		config.addEntry< int >( prefix + "openmp-max-threads", "Set maximum number of OpenMP threads (not supported on this system).", 0 );
		#endif

		}

		bool Host::setup( const Config::ParameterContainer& parameters,
		const String& prefix )
		{
		if( parameters.getParameter< bool >( prefix + "openmp-enabled" ) ) {
		#ifdef HAVE_OPENMP
		enableOMP();
		#else
		std::cerr << "OpenMP is not supported - please recompile the TNL library with OpenMP." << std::endl;
		return false;
		#endif
		}
		else
		disableOMP();
		const int threadsCount = parameters.getParameter< int >( prefix + "openmp-max-threads" );
		if( threadsCount > 1 && ! isOMPEnabled() )
		std::cerr << "Warning: openmp-max-threads was set to " << threadsCount << ", but OpenMP is disabled." << std::endl;
		setMaxThreadsCount( threadsCount );
		return true;
		}

		} // namespace Devices
		} // namespace TNL

src/TNL/Devices/Host.h

+90 −33

Original line number	Diff line number	Diff line
		@@ -11,31 +11,37 @@
		#pragma once

		#include <TNL/String.h>
		#include <TNL/Config/ConfigDescription.h>
		#include <TNL/Config/ParameterContainer.h>

		namespace TNL {

		namespace Config {
		class ConfigDescription;
		class ParameterContainer;
		}
		#ifdef HAVE_OPENMP
		#include <omp.h>
		#endif

		namespace TNL {
		namespace Devices {
		namespace {

		class Host
		{
		public:
		static String getDeviceType()
		{
		return String( "Devices::Host" );
		}

		static String getDeviceType();

		static void disableOMP();
		static void disableOMP()
		{
		ompEnabled = false;
		}

		static void enableOMP();
		static void enableOMP()
		{
		ompEnabled = true;
		}

		static inline bool isOMPEnabled()
		{
		// This MUST stay in the header since we are interested in whether the
		// client was compiled with OpenMP support, not the libtnl.so file.
		// Also, keeping it in the header makes it inline-able.
		#ifdef HAVE_OPENMP
		return ompEnabled;
		#else
		@@ -43,23 +49,74 @@ class Host
		#endif
		}

		static void setMaxThreadsCount( int maxThreadsCount );
		static void setMaxThreadsCount( int maxThreadsCount_ )
		{
		maxThreadsCount = maxThreadsCount_;
		#ifdef HAVE_OPENMP
		omp_set_num_threads( maxThreadsCount );
		#endif
		}

		static int getMaxThreadsCount();
		static int getMaxThreadsCount()
		{
		#ifdef HAVE_OPENMP
		if( maxThreadsCount == -1 )
		return omp_get_max_threads();
		return maxThreadsCount;
		#else
		return 0;
		#endif
		}

		static int getThreadIdx();
		static int getThreadIdx()
		{
		#ifdef HAVE_OPENMP
		return omp_get_thread_num();
		#else
		return 0;
		#endif
		}

		static void configSetup( Config::ConfigDescription& config, const String& prefix = "" );
		static void configSetup( Config::ConfigDescription& config,
		const String& prefix = "" )
		{
		#ifdef HAVE_OPENMP
		config.addEntry< bool >( prefix + "openmp-enabled", "Enable support of OpenMP.", true );
		config.addEntry< int >( prefix + "openmp-max-threads", "Set maximum number of OpenMP threads.", omp_get_max_threads() );
		#else
		config.addEntry< bool >( prefix + "openmp-enabled", "Enable support of OpenMP (not supported on this system).", false );
		config.addEntry< int >( prefix + "openmp-max-threads", "Set maximum number of OpenMP threads (not supported on this system).", 0 );
		#endif
		}

		static bool setup( const Config::ParameterContainer& parameters,
		const String& prefix = "" );
		const String& prefix = "" )
		{
		if( parameters.getParameter< bool >( prefix + "openmp-enabled" ) ) {
		#ifdef HAVE_OPENMP
		enableOMP();
		#else
		std::cerr << "OpenMP is not supported - please recompile the TNL library with OpenMP." << std::endl;
		return false;
		#endif
		}
		else
		disableOMP();
		const int threadsCount = parameters.getParameter< int >( prefix + "openmp-max-threads" );
		if( threadsCount > 1 && ! isOMPEnabled() )
		std::cerr << "Warning: openmp-max-threads was set to " << threadsCount << ", but OpenMP is disabled." << std::endl;
		setMaxThreadsCount( threadsCount );
		return true;
		}

		protected:

		static bool ompEnabled;

		static int maxThreadsCount;
		};

		bool Host::ompEnabled( true );
		int Host::maxThreadsCount( -1 );

		} // namespace <unnamed>
		} // namespace Devices
		} // namespace TNL