changed init back to previous device set method, moved stream init to whitory init routine

Author: Ryan M. Bergmann

main.cpp

@@ -313,8 +313,8 @@ int main(int argc, char* argv[]){
 	// INIT CUDA and HISTORY STUFF and LOAD/UNIONIZE CROS SECTIONS //
 	/////////////////////////////////////////////////////////////////
 
-	unsigned compute_device = 0;
-	whistory hist ( compute_device, N , geom );
+	whistory hist ( N , geom );
+	hist.set_device(0);
 	hist.init();
 	hist.print_xs_data();
 	hist.print_materials_table();
@@ -325,7 +325,7 @@ int main(int argc, char* argv[]){
 
 	hist.set_run_type("criticality");
 	hist.set_tally_cell(tallycell);
-	hist.set_run_param(400,40);  //run, skip
+	hist.set_run_param(40,20);  //run, skip
 	hist.set_filename(filename);
 	hist.run();
 	hist.write_tally(0);

test.py

@@ -75,9 +75,8 @@
 
 
 # init hist and run
-compute_device 	= int(0)
-N_per_cycle		= 100000
-hist = warp.whistory(compute_device,N_per_cycle,geom)
+hist = warp.whistory(100000,geom)
+hist.set_device(0)
 hist.init()
 hist.print_xs_data()
 hist.print_materials_table()

whistory.cpp

@@ -21,12 +21,7 @@
 optix_stuff optix_obj;
 //wgeometry geom_obj;
 
-whistory::whistory(unsigned compute_device_in, unsigned Nin, wgeometry problem_geom_in){
-	//clear device
-	cudaDeviceReset();
-	// device must be set BEFORE an CUDA creation (streams included)
-	compute_device = compute_device_in;
-	cudaSetDevice(compute_device);
+whistory::whistory(unsigned Nin, wgeometry problem_geom_in){
 	// do problem gemetry stuff first
 	problem_geom = problem_geom_in;
 	// set tally vector length
@@ -42,11 +37,20 @@ whistory::whistory(unsigned compute_device_in, unsigned Nin, wgeometry problem_g
 	n_qnodes = 0;
 	reduced_yields_total = 0;
 	accel_type = "Sbvh";
+	// default device to 0
+	compute_device = 0;
+	// not initialized
+	is_initialized = 0;
+}
+void whistory::init(){
+	// device must be set BEFORE an CUDA creation (streams included)
+	cudaSetDevice(compute_device);
+	//clear device
+	cudaDeviceReset();
+	// create streams
 	for (int i = 0; i < 4; ++i){
 		cudaStreamCreate(&stream[i]);
 	}
-}
-void whistory::init(){
 	// init optix stuff 
 	optix_obj.N=Ndataset;
 	optix_obj.stack_size_multiplier=1;
@@ -135,6 +139,7 @@ void whistory::init(){
 	load_cross_sections();
 	//create_quad_tree();
 	copy_data_to_device();
+	is_initialized = 1;
 	printf("Done with init\n");
 }
 whistory::~whistory(){
@@ -1889,6 +1894,26 @@ void whistory::set_run_param(unsigned n_cycles_in, unsigned n_skip_in){
 	n_skip = n_skip_in;
 	n_cycles = n_cycles_in;
 
+}
+void whistory::set_device(unsigned dev_in){
+
+	if (is_initialized){
+		printf("Cannot change device after initialization.  Device already set to %u\n",compute_device);
+		return;
+	}
+
+	//get number to make sure this is a valid device
+	int 			n_devices;
+	cudaGetDeviceCount(&n_devices);
+
+	// set obj
+	if(dev_in < n_devices){
+		compute_device = dev_in;
+	}
+	else{
+		std::cout << "!!!! Device " << dev_in << " does not exist.  Max devices is " << n_devices <<"\n";
+	}
+
 }
 void whistory::device_report(){
 

whistory.h

@@ -53,6 +53,7 @@ class whistory {
 	float 		keff2_sum;
 	float 		keff_err;
 	std::string     filename; /**< file name */
+	unsigned 	is_initialized;  /**< init flag */
 	source_point *  space; /**< source point spatial pointer */
 	/**
 	 * \brief cross section length numbers
@@ -333,7 +334,7 @@ class whistory {
 	 * \details makes geometry, sets tally vector length, creates dataset size, sets
 	 * compute device and acceleration type, creates CUDA streams.
 	 */
-	whistory(unsigned,unsigned,wgeometry);
+	whistory(unsigned,wgeometry);
 	/**
 	 * \brief destructor
 	 */
@@ -405,6 +406,11 @@ class whistory {
 	 * available compute devices
 	 */
 	void device_report();
+	/**
+	 * \brief sets device number to input value
+	 * @param[in] dev_in - device number
+	 */
+	void set_device(unsigned);
 	/**
 	 * \brief does nothing
 	 * @param[in] accel_in - acceleration type

whistory_test.cpp

@@ -11,7 +11,7 @@ TEST_F(whistoryTest, Construction)
 {
 	N = 10000;
 	wgeometry geom;
-	whistory construct_hist(0, N, geom);
+	whistory construct_hist(N, geom);
 }
 
 /**
@@ -40,7 +40,7 @@ TEST_F(whistoryTest, SetRunType)
         geom.set_outer_cell(999);
         geom.update();
         geom.check();
-        whistory hist(0, N, geom);
+        whistory hist(N, geom);
 	hist.set_run_type("criticality");
 }
 
@@ -70,7 +70,7 @@ TEST_F(whistoryTest, SetTallyCell)
         geom.set_outer_cell(999);
         geom.update();
         geom.check();
-        whistory hist(0, N, geom);
+        whistory hist(N, geom);
 	hist.set_tally_cell(999);
 }
 
@@ -100,7 +100,7 @@ TEST_F(whistoryTest, SetRunParam)
         geom.set_outer_cell(999);
         geom.update();
         geom.check();
-        whistory hist(0, N, geom);
+        whistory hist(N, geom);
 	hist.set_run_param(40,20);
 }
 
@@ -130,7 +130,7 @@ TEST_F(whistoryTest, SetFilename)
         geom.set_outer_cell(999);
         geom.update();
         geom.check();
-        whistory hist(0, N, geom);
+        whistory hist(N, geom);
 	EXPECT_NO_THROW(hist.set_filename("whistory_test_log.txt"));
 }
 
@@ -140,30 +140,29 @@ TEST_F(whistoryTest, SetFilename)
  * \details creates a wgeometry object that contains a fissile material and constructs a whistory with 
  * that wgeometry. tests that no error is thrown when the device is set.
  */
- // NO LONGER IMPLEMENTED
-//TEST_F(whistoryTest, SetDevice)
-//{
-//        N = 10000;
-//        wgeometry geom;
-//        material = 1;
-//        is_fissile = 1;
-//        n_isotopes = 1;
-//        density = 19.816;
-//        isotopes.push_back(94239);
-//        mat_fracs.push_back(1);
-//        geom.add_material(material,is_fissile,n_isotopes,density,isotopes,mat_fracs);
-//        type = 3;
-//        min[0] = -5.1; min[1] = -5.1; min[2] = -5.1;
-//        max[0] =  5.1; max[1] =  5.1; max[2] =  5.1;
-//        origin[0] = 0; origin[1] = 0; origin[2] = 0;
-//        geom.add_primitive(type, material, min, max, origin);
-//        geom.add_transform(0,999,0,0,0,0,0);
-//        geom.set_outer_cell(999);
-//        geom.update();
-//        geom.check();
-//        whistory hist(N, geom);
-//	EXPECT_NO_THROW(hist.set_device(0));
-//}
+TEST_F(whistoryTest, SetDevice)
+{
+        N = 10000;
+        wgeometry geom;
+        material = 1;
+        is_fissile = 1;
+        n_isotopes = 1;
+        density = 19.816;
+        isotopes.push_back(94239);
+        mat_fracs.push_back(1);
+        geom.add_material(material,is_fissile,n_isotopes,density,isotopes,mat_fracs);
+        type = 3;
+        min[0] = -5.1; min[1] = -5.1; min[2] = -5.1;
+        max[0] =  5.1; max[1] =  5.1; max[2] =  5.1;
+        origin[0] = 0; origin[1] = 0; origin[2] = 0;
+        geom.add_primitive(type, material, min, max, origin);
+        geom.add_transform(0,999,0,0,0,0,0);
+        geom.set_outer_cell(999);
+        geom.update();
+        geom.check();
+        whistory hist(N, geom);
+	EXPECT_NO_THROW(hist.set_device(0));
+}
 
 /**
  * \brief initialization test
@@ -191,7 +190,7 @@ TEST_F(whistoryTest, Init)
 	geom.set_outer_cell(999);
 	geom.update();
 	geom.check();
-        whistory init_hist(0, N, geom);
+        whistory init_hist(N, geom);
 	init_hist.init();
 }