Merge pull request #452 from unoebauer/build_fix

Build fix and nthreads fix - fixes #356

setup.py

@@ -15,7 +15,7 @@
     import __builtin__ as builtins
 builtins._ASTROPY_SETUP_ = True
 
-from astropy_helpers.setup_helpers import (register_commands, adjust_compiler, 
+from astropy_helpers.setup_helpers import (register_commands, adjust_compiler,
                                            get_debug_option, get_package_info,
                                            add_command_option)
 from astropy_helpers.git_helpers import get_git_devstr
@@ -101,6 +101,8 @@
     hook_func = 'astropy.utils.release:' + '_'.join(hook)
     entry_points[hook_ep] = ['%s = %s' % (hook_name, hook_func)]
 
+from Cython.Build import cythonize
+package_info['ext_modules'] = cythonize(package_info['ext_modules'])
 # Include all .c files, recursively, including those generated by
 # Cython, since we can not do this in MANIFEST.in with a "dynamic"
 # directory name.

tardis/montecarlo/src/cmontecarlo.c

@@ -826,9 +826,9 @@ montecarlo_main_loop(storage_model_t * storage, int64_t virtual_packet_flag, int
   storage->virt_array_size = storage->no_of_packets;
 #endif // WITH_VPACKET_LOGGING
 #ifdef WITHOPENMP
-  fprintf(stderr, "Running with OpenMP - %d threads\n", nthreads);
   omp_set_dynamic(0);
   omp_set_num_threads(nthreads);
+  fprintf(stderr, "Running with OpenMP - %d threads\n", omp_get_num_threads());
 #pragma omp parallel
   {
     rk_state mt_state;