Changeset aab3d87 in sasmodels

Timestamp:

May 27, 2016 12:47:16 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

30f8863

Parents:

197e41d

Message:

tag model dlls with x86 or amd64 on windows to avoid future conflicts from a 64-bit release

File:

• sasmodels/kerneldll.py (modified) (4 diffs)

sasmodels/kerneldll.py

@@ -62 +62 @@
 
 if os.name == 'nt':
+    ARCH = "amd64" if sys.maxint > 2**32 else "x86"  # maxint=2**31-1 on 32 bit
     # Windows compiler; check if TinyCC is available
     try:
@@ -95 +96 @@
             return CC + ["%s"%source, "-o", "%s"%output, "-lm"]
 else:
+    ARCH = ""
     # Generic unix compile
     # On mac users will need the X code command line tools installed
@@ -142 +144 @@
 
     # Hack to find precompiled dlls
-    path = joinpath(generate.DATA_PATH, '..', 'compiled_models', basename+'.so')
+    path = joinpath(generate.DATA_PATH, '..', 'compiled_models',
+                    basename + ARCH + '.so')
     if os.path.exists(path):
         return path
@@ -176 +179 @@
         dtype = generate.F64  # Force 64-bit dll
 
+    # File name for generated C code
     if dtype == generate.F32: # 32-bit dll
         tempfile_prefix = 'sas_' + model_info['name'] + '32_'