Changeset e79a467 in sasview

Timestamp:

Dec 29, 2011 11:10:25 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

aba60f4

Parents:

ebdb833

Message:

reverting the not working command line arg. : need more work

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -3 +3 @@
     #TODO: Add checks to see that all the dependencies are on the system
 """
-# [command] can be any of the following:
-#   -nomp: no openmp: Use this flag; C-lib without openmp as well as numpy < 1.6
-
 import sys
 
-if len(sys.argv) == 1:
-    sys.argv.append('install')
 import os
 import platform
@@ -70 +65 @@
     
 enable_openmp = True                    
-if sys.argv[-1] == "-nomp":
-    # Disable OpenMP
-    enable_openmp = False
+
 if sys.platform =='darwin' and not is_64bits:
     # Disable OpenMP