Changeset 6032


Ignore:
Timestamp:
Feb 22, 2016, 2:58:13 AM (9 years ago)
Author:
ldelgass
Message:

Merge change from 1.4 branch to remove use of use script for puq

Location:
trunk
Files:
1 added
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r6021 r6032  
    1021610216
    1021710217
    10218 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile"
     10218ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile puq/puq"
    1021910219
    1022010220cat >confcache <<\_ACEOF
     
    1104111041    "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;;
    1104211042    "puq/Makefile") CONFIG_FILES="$CONFIG_FILES puq/Makefile" ;;
     11043    "puq/puq") CONFIG_FILES="$CONFIG_FILES puq/puq" ;;
    1104311044
    1104411045  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • trunk/configure.in

    r6021 r6032  
    601601    oldtest/src/Makefile
    602602    puq/Makefile
     603    puq/puq
    603604])
    604605AC_OUTPUT
  • trunk/gui/apps/rappture.use.in

    r6021 r6032  
    11
    22conflict RAPPTURE_CHOICE
    3 
    4 use -r -e anaconda-2.3.0
    5 use -r -e puq-2.2.14
    63
    74desc "The Rappture tool environment (released version)."
  • trunk/gui/scripts/responseviewer.tcl

    r6026 r6032  
    152152
    153153    set rs $_response
    154     if {[catch {exec get_response.py $fname $rs $var1 $var2 $_label} res]} {
     154    if {[catch {exec puq get_response $fname $rs $var1 $var2 $_label} res]} {
    155155        set fp [open "response.err" r]
    156156        set rdata [read $fp]
  • trunk/lang/tcl/scripts/task.tcl

    r6021 r6032  
    404404            # UQ. Collect data from all jobs and put it in one xml run file.
    405405            file delete -force -- run_uq.xml
    406             if {[catch {exec puq_analyze.py puq_[pid].hdf5} res]} {
     406            if {[catch {exec puq analyze puq_[pid].hdf5} res]} {
    407407                set fp [open "uq_debug.err" r]
    408408                set rdata [read $fp]
     
    648648itcl::body Rappture::Task::_get_params {varlist uq_type uq_args} {
    649649    set pid [pid]
    650     # puts "get_params.py $pid $varlist $uq_type $uq_args"
    651     if {[catch {exec get_params.py $pid $varlist $uq_type $uq_args}]} {
     650    # puts "puq get_params $pid $varlist $uq_type $uq_args"
     651    if {[catch {exec puq get_params $pid $varlist $uq_type $uq_args}]} {
    652652        set fp [open "uq_debug.err" r]
    653653        set rdata [read $fp]
  • trunk/puq/Makefile.in

    r6021 r6032  
    1616pkgincludedir   = $(includedir)/$(PKG_DIR)
    1717top_builddir    = .
     18puq_libdir      = $(libdir)/puq
    1819
    1920MKDIR_P         = @MKDIR_P@
     
    2122
    2223SCRIPTS = $(srcdir)/get_params.py \
    23         $(srcdir)/puq_analyze.py \
    24         $(srcdir)/get_response.py
     24        $(srcdir)/analyze.py \
     25        $(srcdir)/get_response.py
    2526
    2627.PHONY: all install clean distclean
     
    2930
    3031install: all
    31         $(MKDIR_P) -m 0755 $(bindir)
     32        $(MKDIR_P) -m 0755 $(pub_libdir)
    3233        @for i in $(SCRIPTS); do \
    3334            echo "Installing $$i" ; \
    34             $(INSTALL) -m 0555 $$i $(bindir) ; \
     35            $(INSTALL) -m 0555 $$i $(puq_libdir) ; \
    3536        done
     37        $(INSTALL) -m 0555 puq $(bindir)
    3638
    3739clean:
Note: See TracChangeset for help on using the changeset viewer.