Ticket #12016: trac_12016-root.v2.patch

File trac_12016-root.v2.patch, 2.7 KB (added by jhpalmieri, 10 years ago)
  • .hgignore

    # HG changeset patch
    # User J. H. Palmieri <palmieri@math.washington.edu>
    # Date 1321115780 28800
    # Node ID e927b857cfbd00a30f8ca7149121eecbd9bdbca1
    # Parent  ba0a4e35e92007b30ad9489a4082731b37222da1
    #12016: change description of NUM_THREADS in Makefile
    
    diff --git a/.hgignore b/.hgignore
    a b  
    33(^|/)\._\.DS_Store$
    44sage-README-osx.txt
    55~$
     6\.rej$
    67\.pyc$
    78.hgignore~
    89data
  • Makefile

    diff --git a/Makefile b/Makefile
    a b  
    77# See below for targets to build the documentation in other formats,
    88# to run various types of test suites, and to remove parts of the build etc.
    99
    10 # TODO:
    11 #   * Shorten description of NUM_THREADS below?
    12 
    13 # NUM_THREADS is the number of threads to use for parallel testing (and
    14 # sometime in the future, parallel building).  If this is 0, then it
    15 # will be set to the number of processors, with a default maximum of 8
    16 # -- see sage-ptest.
    17 #
    18 # The detection of number of processors might not be reliable on some
    19 # platforms. On a Sun SPARC T5240 (t2.math), the number of processors
    20 # reported by multiprocessing.cpu_count() might not correspond to the
    21 # actual number of processors. See ticket #6283.
    22 # Python's multiprocessing.cpu_count() actually returns the number of
    23 # *hardware threads*, which is >= number of cores.
    24 #
    25 # WARNING: if your machine has <= 8 cpus (according to cpu_count() and
    26 # you *don't* want to use that many threads for parallel doctesting,
    27 # change the value of NUM_THREADS to a (sensible) positive integer. If
    28 # cpu_count() reports > 8, then if NUM_THREADS is 0, only 8 threads will
    29 # be used. The default value is zero.
    30 NUM_THREADS = 0 # 0 interpreted as min(8, multiprocessing.cpu_count())
    31 
    3210PIPE = spkg/pipestatus
    3311
    3412
    testalllong: all # i.e. build and doc 
    136114
    137115ptest: all # i.e. build and doc
    138116        $(TESTPRELIMS)
    139         $(PIPE) "./sage -tp $(NUM_THREADS) --sagenb $(TESTDIRS) 2>&1" "tee -a ptest.log"
     117        $(PIPE) "./sage -tp 0 --sagenb $(TESTDIRS) 2>&1" "tee -a ptest.log"
    140118
    141119ptestall: all # i.e. build and doc
    142120        $(TESTPRELIMS)
    143         $(PIPE) "./sage -tp $(NUM_THREADS) --sagenb --optional $(TESTDIRS) 2>&1" "tee -a ptestall.log"
     121        $(PIPE) "./sage -tp 0 --sagenb --optional $(TESTDIRS) 2>&1" "tee -a ptestall.log"
    144122
    145123ptestlong: all # i.e. build and doc
    146124        $(TESTPRELIMS)
    147         $(PIPE) "./sage -tp $(NUM_THREADS) --sagenb --long $(TESTDIRS) 2>&1" "tee -a ptestlong.log"
     125        $(PIPE) "./sage -tp 0 --sagenb --long $(TESTDIRS) 2>&1" "tee -a ptestlong.log"
    148126
    149127ptestalllong: all # i.e. build and doc
    150128        $(TESTPRELIMS)
    151         $(PIPE) "./sage -tp $(NUM_THREADS) --sagenb --optional --long $(TESTDIRS) 2>&1" "tee -a ptestalllong.log"
     129        $(PIPE) "./sage -tp 0 --sagenb --optional --long $(TESTDIRS) 2>&1" "tee -a ptestalllong.log"
    152130
    153131
    154132testoptional: testall # just an alias