Changeset 30669 in project


Ignore:
Timestamp:
04/09/14 05:01:55 (7 years ago)
Author:
Ivan Raikov
Message:

picnic: some bug fixes to multiple process generation

Location:
release/4/picnic/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/picnic/trunk/picnic-utils.scm

    r30664 r30669  
    134134       
    135135        (define (write-pointset name pts)
    136             (call-with-output-file (string-append (->string name) ".sorted.dat")
     136            (call-with-output-file (sprintf "~A.sorted.dat" name)
    137137              (lambda (out)
    138138                (for-each (lambda (x)
     
    144144              ))
    145145
    146         (define (write-sections section-name sections)
    147           (call-with-output-file (string-append (->string section-name) ".section.dat")
     146        (define (write-sections forest-name section-name sections)
     147          (call-with-output-file (sprintf "~A.~A.section.dat" forest-name section-name)
    148148            (lambda (out)
    149149              (for-each
     
    762762            (MPI:barrier my-comm)
    763763
    764             (print "my-results = " my-results)
    765      
    766764            (call-with-output-file (sprintf "~Asources~A.dat"  label (if (> size 1) myrank ""))
    767765              (lambda (out-sources)
  • release/4/picnic/trunk/picnic.scm

    r30663 r30669  
    598598
    599599                               
    600 (define (invoke-generator/scheme sys section-name section-processes layout-name)
     600(define (invoke-generator/scheme sys section-name section-processes layout-name forest-name)
    601601  (let* ((origin (gensym 'p))
    602602         (make-section (cases picnic:quantity
     
    654654                                       (((f n) (i lst))
    655655                                        (list (+ i n)
    656                                               (list-tabulate n
    657                                                              (lambda (j) (list (+ i j) (f)))))))
     656                                              (append
     657                                               (list-tabulate
     658                                                n (lambda (j) (list (+ i j) (f)))) lst))))
    658659                                      (list 0 '())
    659660                                      (list . ,(map (match-lambda
     
    666667                ,layout-name))))
    667668         (if (picnic-write-sections)
    668              (write-sections (quote ,section-name) result))
     669             (write-sections (quote ,forest-name) (quote ,section-name) result))
    669670         result
    670671         ))
     
    745746                      (section-label (section-descriptor-label section)))
    746747                  `(,section-name
    747                     ,(invoke-generator/scheme sys section-label section-processes layout-name))
     748                    ,(invoke-generator/scheme sys section-label section-processes layout-name (cn forest)))
    748749                  ))
    749750              sections
Note: See TracChangeset for help on using the changeset viewer.