[Boost-commit] svn:boost r68275 - in sandbox/odeint/branches/karsten: boost/numeric/odeint/algebra/external libs/numeric/odeint/test/thrust

Subject: [Boost-commit] svn:boost r68275 - in sandbox/odeint/branches/karsten: boost/numeric/odeint/algebra/external libs/numeric/odeint/test/thrust
From: karsten.ahnert_at_[hidden]
Date: 2011-01-19 06:24:17

Author: karsten
Date: 2011-01-19 06:24:04 EST (Wed, 19 Jan 2011)
New Revision: 68275
URL: http://svn.boost.org/trac/boost/changeset/68275

Log:
* changing thrust operations
Text files modified: 
   sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/external/thrust_operations.hpp |    22 +++-------------------                  
   sandbox/odeint/branches/karsten/libs/numeric/odeint/test/thrust/Makefile                    |     2 +-                                      
   2 files changed, 4 insertions(+), 20 deletions(-)

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/external/thrust_operations.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/external/thrust_operations.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/external/thrust_operations.hpp	2011-01-19 06:24:04 EST (Wed, 19 Jan 2011)
@@ -19,29 +19,13 @@
 #include <thrust/iterator/zip_iterator.h>
 
 
-template< class Time >
 struct thrust_operations
 {
-	typedef Time time_type;
-
-	struct increment1
-	{
-		time_type m_dt;
-
-		increment1( time_type dt ) : m_dt( dt ) { }
-
-		template< class Tuple >
-		__host__ __device__
-		void operator()( Tuple t ) const
-		{
-			thrust::get<0>(t) += m_dt * thrust::get<1>(t);
-		}
-	};
-
+	template< class Fac1 , class Fac2 >
         struct scale_sum2
         {
-		const time_type m_alpha1;
-		const time_type m_alpha2;
+		const Fac1 m_alpha1;
+		const Fac2 m_alpha2;
 
                 scale_sum2( const time_type alpha1 , const time_type alpha2 ) : m_alpha1( alpha1 ) , m_alpha2( alpha2 ) { }
 

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/test/thrust/Makefile
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/test/thrust/Makefile	(original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/test/thrust/Makefile	2011-01-19 06:24:04 EST (Wed, 19 Jan 2011)
@@ -6,7 +6,7 @@
 
 INCLUDES += -I$(BOOST_ROOT) -I$(THRUST_ROOT) -I$(CUDA_ROOT)/include -I../../../../..
 
-NVCCFLAGS = -O3 $(INCLUDES) --compiler-bindir=/usr/bin/g++-4.4
+NVCCFLAGS = -O3 $(INCLUDES) --compiler-bindir=/usr/bin/g++
 
 LDLIBS = -lcudart
 LDFLAGS = -L$(CUDA_ROOT)/lib64