Changeset 5753e4e in sasmodels


Ignore:
Timestamp:
Nov 24, 2015 3:30:12 PM (8 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:
062c56d, 402c351
Parents:
a30cdd5
Message:

support compare/multi_compare on windows

Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • compare.sh

    r73a3e22 r5753e4e  
    11#!/bin/bash 
    22 
    3 #SASVIEW=$(ls -d ../sasview/build/lib.*) 
    4 SASVIEW=( ../sasview/build/lib.* ) 
    5 #PYOPENCL_CTX=${CTX:-1} 
    6 PYTHONPATH=../bumps:../periodictable:$SASVIEW 
     3sasview=( ../sasview/build/lib.* ) 
     4sep=$(python -c "import os;print(os.pathsep)") 
     5PYTHONPATH=../bumps${sep}../periodictable${sep}$sasview 
    76export PYTHONPATH 
     7#echo PYTHONPATH=$PYTHONPATH 
    88 
    9 #set -x 
     9#PYOPENCL_COMPILER_OUTPUT=1; export PYOPENCL_COMPILER_OUTPUT 
     10#PYOPENCL_CTX=${CTX:-1}; export PYOPENCL_CTX 
     11 
     12#SAS_OPENMP=1; export SAS_OPENMP 
    1013 
    1114python -m sasmodels.compare $* 

  • multi_compare.sh

    r87e70a3 r5753e4e  
    11#!/bin/sh 
    22 
    3 SASVIEW=$(ls -d ../sasview/build/lib.*) 
    4 PYTHONPATH=../bumps:../periodictable:$SASVIEW 
     3sasview=( ../sasview/build/lib.* ) 
     4sep=$(python -c "import os;print(os.pathsep)") 
     5PYTHONPATH=../bumps${sep}../periodictable${sep}$sasview 
    56export PYTHONPATH 
     7#echo PYTHONPATH=$PYTHONPATH 
    68 
    7 #echo PYTHONPATH=$PYTHONPATH 
     9#PYOPENCL_COMPILER_OUTPUT=1; export PYOPENCL_COMPILER_OUTPUT 
     10#PYOPENCL_CTX=${CTX:-1}; export PYOPENCL_CTX 
     11 
     12#SAS_OPENMP=1; export SAS_OPENMP 
    813 
    914python -m sasmodels.compare_many $* 

  • sasmodels/compare.py

    rcd3dba0 r5753e4e  
    77import glob 
    88import datetime 
     9import traceback 
    910 
    1011import numpy as np 
    … …  
    278279            #print "sasview",cpu 
    279280        except ImportError: 
     281            traceback.print_exc() 
    280282            Ncpu = 0 
    281283 
Note: See TracChangeset for help on using the changeset viewer.