Changeset 2307
- Timestamp:
- Jul 10, 2011, 5:55:10 PM (13 years ago)
- Location:
- branches/blt4
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/cf/rpLangJava.m4
r2279 r2307 1 1 AC_DEFUN([RP_LANG_JAVA],[ 2 rp_with_java="yes"3 2 AC_ARG_WITH([java], 4 3 [AS_HELP_STRING([--with-java[=DIR]],[location of java @<:@default=yes@:>@])], 5 [ rp_with_java=$withval],6 [ rp_with_java=yes])4 [], 5 [with_java=yes]) 7 6 JAVA="" 8 7 JAVAH="" 9 8 JAVAC="" 10 9 JAVA_DEV_PKG="no" 11 AC_ARG_WITH(12 [java],13 [AS_HELP_STRING([--with-java=DIR], [location of java @<:@default=yes@:>@])],14 [rp_with_java=$withval])15 10 16 if test "${ rp_with_java}" != "no" ; then17 if test "${ rp_with_java}" = "yes" ; then11 if test "${with_java}" != "no" ; then 12 if test "${with_java}" = "yes" ; then 18 13 AC_PATH_PROG(JAVA, java) 19 14 AC_PATH_PROG(JAVAC, javac) 20 15 AC_PATH_PROG(JAVAH, javah) 21 16 else 22 AC_PATH_PROG(JAVA, java, [], [${ rp_with_java}/bin:${rp_with_java}])23 AC_PATH_PROG(JAVAC, javac, [], [${ rp_with_java}/bin:${rp_with_java}])24 AC_PATH_PROG(JAVAH, javah, [], [${ rp_with_java}/bin:${rp_with_java}])17 AC_PATH_PROG(JAVA, java, [], [${with_java}/bin:${with_java}]) 18 AC_PATH_PROG(JAVAC, javac, [], [${with_java}/bin:${with_java}]) 19 AC_PATH_PROG(JAVAH, javah, [], [${with_java}/bin:${with_java}]) 25 20 fi 26 21 fi … … 32 27 if test "x${JAVA}" != "x" ; then 33 28 for d in \ 34 ${ rp_with_java} \29 ${with_java} \ 35 30 ${JAVA_HOME} \ 36 31 /apps/java/jdk1.6* \ -
branches/blt4/cf/rpLangMatlab.m4
r2279 r2307 1 1 AC_DEFUN([RP_LANG_MATLAB],[ 2 rp_with_matlab="yes"2 with_matlab="yes" 3 3 AC_ARG_WITH( 4 4 [matlab], 5 5 [AS_HELP_STRING([--with-matlab[=DIR]], 6 6 [location of matlab and mex compiler @<:@default=yes@:>@])], 7 [ rp_with_matlab=$withval],8 [ rp_with_matlab=yes])7 [], 8 [with_matlab=yes]) 9 9 10 10 MCC="" … … 13 13 MEXEXT="" 14 14 MATLAB= 15 if test "$ rp_with_matlab" != "no" ; then16 if test "$ rp_with_matlab" = "yes" ; then15 if test "$with_matlab" != "no" ; then 16 if test "$with_matlab" = "yes" ; then 17 17 AC_PATH_PROG(MATLAB, matlab) 18 18 else 19 AC_PATH_PROG(MATLAB, matlab, [], [${ rp_with_matlab}/bin:${rp_with_matlab}])19 AC_PATH_PROG(MATLAB, matlab, [], [${with_matlab}/bin:${with_matlab}]) 20 20 fi 21 21 fi -
branches/blt4/cf/rpLangOctave.m4
r2279 r2307 22 22 # Standard octave search (use the installed version of octave) 23 23 AC_DEFUN([RP_LANG_OCTAVE],[ 24 rp_with_octave="yes"25 24 AC_ARG_WITH( 26 25 [octave], 27 26 [AS_HELP_STRING([--with-octave[=DIR]], 28 27 [path of default octave compiler `mkoctfile' @<:@default=yes@:>@])], 29 [ rp_with_octave=$withval],30 [ rp_with_octave=yes])28 [], 29 [with_octave=yes]) 31 30 32 31 OCTAVE= … … 36 35 MKOCTFILE3= 37 36 38 if test "$ rp_with_octave" != "no" ; then39 if test "$ rp_with_octave" = "yes" ; then37 if test "$with_octave" != "no" ; then 38 if test "$with_octave" = "yes" ; then 40 39 AC_PATH_PROG(OCTAVE, octave) 41 40 AC_PATH_PROG(MKOCTFILE, mkoctfile) 42 41 else 43 OCTAVE=$ rp_with_octave44 MKOCTFILE=`dirname $ rp_with_octave`/mkoctfile42 OCTAVE=$with_octave 43 MKOCTFILE=`dirname $with_octave`/mkoctfile 45 44 fi 46 45 fi … … 80 79 [AS_HELP_STRING([--with-mkoctfile3[=DIR]], 81 80 [path of octave compiler `mkoctfile' @<:@default=no@:>@])], 82 [ rp_with_mkoctfile3=$withval],83 [ rp_with_mkoctfile3=no])81 [], 82 [with_mkoctfile3=no]) 84 83 85 if test "$ rp_with_mkoctfile3" != "no" ; then86 if test "$ rp_with_mkoctfile3" = "yes" ; then84 if test "$with_mkoctfile3" != "no" ; then 85 if test "$with_mkoctfile3" = "yes" ; then 87 86 AC_PATH_PROG(mkoctfile3, mkoctfile) 88 87 else 89 MKOCTFILE3=$ rp_with_mkoctfile388 MKOCTFILE3=$with_mkoctfile3 90 89 fi 91 90 OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3` … … 99 98 [AS_HELP_STRING([--with-mkoctfile2[=DIR]], 100 99 [path of octave compiler `mkoctfile' @<:@default=no@:>@])], 101 [ rp_with_mkoctfile2=$withval],102 [ rp_with_mkoctfile2=no])100 [], 101 [with_mkoctfile2=no]) 103 102 104 if test "$ rp_with_mkoctfile2" != "no" ; then105 if test "$ rp_with_mkoctfile2" = "yes" ; then103 if test "$with_mkoctfile2" != "no" ; then 104 if test "$with_mkoctfile2" = "yes" ; then 106 105 AC_PATH_PROG(mkoctfile2, mkoctfile) 107 106 else 108 MKOCTFILE2=$ rp_with_mkoctfile2107 MKOCTFILE2=$with_mkoctfile2 109 108 fi 110 109 # Have to use octave to get a version, instead of mkoctfile. … … 113 112 OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1` 114 113 fi 115 116 117 echo "MKOCTFILE2 = $MKOCTFILE2"118 echo "MKOCTFILE3 = $MKOCTFILE3"119 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"120 echo "OCTAVE_VERSION = $OCTAVE_VERSION"121 114 ]) -
branches/blt4/cf/rpLangPerl.m4
r2279 r2307 5 5 [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])], 6 6 [], 7 [ rp_with_perl=yes])7 [with_perl=yes]) 8 8 9 9 PERL= … … 18 18 PERL_VERSION_RV= 19 19 PERL_LIBSPEC= 20 if test "$ rp_with_perl" != "no" ; then21 if test "$ rp_with_perl" != "yes" ; then22 AC_PATH_PROG(PERL, perl, [], [$ rp_with_perl/bin:$rp_with_perl])20 if test "$with_perl" != "no" ; then 21 if test "$with_perl" != "yes" ; then 22 AC_PATH_PROG(PERL, perl, [], [$with_perl/bin:$with_perl]) 23 23 else 24 24 AC_PATH_PROG(PERL, perl) -
branches/blt4/cf/rpLangPython.m4
r2279 r2307 13 13 PYTHON_VERSION="" 14 14 pythondir="" 15 rp_with_python="yes"16 15 AC_ARG_WITH([python], 17 16 [AS_HELP_STRING([--with-python[=DIR]],[location of python @<:@default=yes@:>@])], 18 [ rp_with_python=$withval],19 [ rp_with_python=yes])17 [], 18 [with_python=yes]) 20 19 21 if test "$ rp_with_python" != "no" ; then22 if test "$ rp_with_python" = "yes" ; then20 if test "$with_python" != "no" ; then 21 if test "$with_python" = "yes" ; then 23 22 AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) 24 23 else 25 AC_PATH_PROG(PYTHON, python, [], [${ rp_with_python}/bin:${rp_with_python}])24 AC_PATH_PROG(PYTHON, python, [], [${with_python}/bin:${with_python}]) 26 25 fi 27 26 AC_MSG_CHECKING([for Python version]) -
branches/blt4/lang/Makefile.in
r2281 r2307 20 20 PYTHON = @PYTHON_DISTUTILS@ 21 21 MEX = @MEX@ 22 MKOCTFILE = @MKOCTFILE2@ @MKOCTFILE3@23 JAVA _HOME = @JAVA_HOME@22 OCTAVE = @OCTAVE_VERSION@ 23 JAVAC = @JAVAC@ 24 24 25 25 # Rappture requires it. We always build a Tcl language API. … … 38 38 LANGS += matlab 39 39 endif 40 ifneq ($( MKOCTFILE),)40 ifneq ($(OCTAVE),) 41 41 LANGS += octave 42 42 endif 43 ifneq ($(JAVA _HOME),)43 ifneq ($(JAVAC),) 44 44 LANGS += java 45 45 endif -
branches/blt4/lang/tcl/pkgIndex.tcl.in
r1151 r2307 12 12 set ext [info sharedlibextension] 13 13 load [file join $dir "Rappture${version}${ext}"] 14 package require BLT15 14 package provide Rappture $version 16 15 } $dir] -
branches/blt4/lang/tcl/src/Makefile.in
r2208 r2307 37 37 -I$(srcdir)/../../../src/objects \ 38 38 -I$(includedir) 39 40 39 version = @PACKAGE_VERSION@ 41 40 DEFINES = -DPACKAGE_VERSION=\"$(version)\" -
branches/blt4/packages/vizservers/nanoscale/server.c
r2120 r2307 75 75 _x > _y ? _x : _y; }) 76 76 77 #ifdef notdef78 static int79 find_best_host(void)80 {81 int h;82 float best = load;83 int index = -1;84 //printf("My load is %f\n", best);85 for(h=0; h<sizeof(host_array)/sizeof(host_array[0]); h++) {86 if (host_array[h].in_addr.s_addr == 0)87 continue;88 //printf("%d I think load for %s is %f ", h,89 // inet_ntoa(host_array[h].in_addr), host_array[h].load);90 if (host_array[h].children <= children) {91 if (host_array[h].load < best) {92 //if ((random() % 100) < 75) {93 index = h;94 best = host_array[h].load;95 //}96 //printf(" Better\n");97 } else {98 //printf(" Worse\n");99 }100 }101 }102 103 //printf("I choose %d\n", index);104 return index;105 }106 #endif107 108 static void109 broadcast_load(void)110 {111 int msg[2];112 msg[0] = htonl(load);113 msg[1] = htonl(children);114 int status;115 status = sendto(send_fd, &msg, sizeof(msg), 0, (struct sockaddr *)&send_addr,116 sizeof(send_addr));117 if (status < 0) {118 perror("sendto");119 }120 }121 77 122 78 static void … … 140 96 children, memory_in_use, load); 141 97 142 #ifdef notdef143 broadcast_load();144 #endif145 98 } 146 99 … … 158 111 return; 159 112 } 160 }161 }162 163 static void164 update_load_average(void)165 {166 static unsigned int counter;167 168 load = load / LOAD_DROP_OFF;169 float newload = 0.0;170 int c;171 for(c=0; c < sizeof(child_array)/sizeof(child_array[0]); c++) {172 if (child_array[c].pipefd != 0) {173 newload += child_array[c].requests * child_array[c].memory;174 child_array[c].requests = 0;175 }176 }177 load = load + newload;178 179 if ((counter++ % BROADCAST_INTERVAL) == 0) {180 broadcast_load();181 113 } 182 114 } … … 291 223 server_command[0][0]=='\0') { 292 224 int i; 293 fprintf(stderr, "nservices=%d, recv_port=%d, server_command[0]=%s\n", nservices, recv_port, server_command[0]);294 225 for (i = 0; i < argc; i++) { 295 226 fprintf(stderr, "argv[%d]=(%s)\n", i, argv[i]); … … 399 330 // We're ready to go. Before going into the main loop, 400 331 // broadcast a load announcement to other machines. 401 #ifdef notdef402 broadcast_load();403 #endif404 332 int maxfd = send_fd; 405 333 FD_ZERO(&saved_rfds); … … 428 356 if (status <= 0) { 429 357 if (sigalarm_set) { 430 update_load_average();431 358 sigalarm_set = 0; 432 359 } 433 360 continue; 434 361 } 435 436 362 437 363 int accepted = 0; … … 537 463 int newmemory = ntohl(msg); 538 464 539 #ifdef notdef540 // Find the best host to create a new child on.541 int index = find_best_host();542 543 // Only redirect if another host's load is significantly less544 // than our own...545 if (index != -1 &&546 (host_array[index].load < (LOAD_REDIRECT_FACTOR * load))) {547 548 // If we're redirecting to another machine, give that549 // machine an extra boost in our copy of the load550 // statistics. This will keep us from sending the very551 // next job to it. Eventually, the other machine will552 // broadcast its real load and we can make an informed553 // decision as to who redirect to again.554 host_array[index].load += newmemory * INITIAL_LOAD;555 556 // Redirect to another machine.557 printf("Redirecting to %s\n",558 inet_ntoa(host_array[index].in_addr));559 write(i, &host_array[index].in_addr.s_addr, 4);560 FD_CLR(i, &saved_rfds);561 clear_service_fd(i);562 close(i);563 continue;564 }565 #endif566 465 memory_in_use += newmemory; 567 466 load += 2*INITIAL_LOAD; 568 #ifdef notdef569 broadcast_load();570 #endif571 467 printf("Accepted new job with memory %d\n", newmemory); 572 468 //printf("My load is now %f\n", load); … … 654 550 655 551 children++; 656 broadcast_load();657 552 } 658 553 -
branches/blt4/packages/vizservers/nanovis/Command.cpp
r1982 r2307 785 785 786 786 static Rappture::CmdSpec cutplaneOps[] = { 787 {"position", 1, CutplanePositionOp, 4, 0, " bool axis ?indices?",},788 {"state", 1, CutplaneStateOp, 4, 0, " relval axis ?indices?",},787 {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",}, 788 {"state", 1, CutplaneStateOp, 4, 0, "bool axis ?indices?",}, 789 789 }; 790 790 static int nCutplaneOps = NumCmdSpecs(cutplaneOps); -
branches/blt4/packages/vizservers/nanovis/ParticleSystem.cpp
r2120 r2307 13 13 #include <GL/glaux.h> 14 14 #else 15 #ifdef notdef 15 16 #include <opencv/cv.h> 16 17 #include <opencv/highgui.h> 18 #endif 17 19 #endif 18 20 -
branches/blt4/packages/vizservers/nanovis/Volume.h
r1510 r2307 117 117 float size, int n_component, float* data, double vmin, double vmax, 118 118 double nonzero_min); 119 ~Volume();119 virtual ~Volume(); 120 120 121 121 public : -
branches/blt4/packages/vizservers/start_viz.sh.in
r2120 r2307 12 12 broadcast=`hostname -i | sed 's/\.[0-9]*$/.255/'` 13 13 14 render_dir="@prefix@" 15 vtk_lib_dir="@VTK_LIB_DIR@" 14 exec_prefix="@exec_prefix@" 15 bindir="@bindir@" 16 libdir="@libdir@" 17 . ${bindir}/rappture.env 18 16 19 nanoscale_port=2000 17 20 nanovis_port=2000 … … 19 22 pymol_port=2020 20 23 21 # Build the name of the run directory. This is where nanoscale and the 22 # visualization programs will reside. The directory name is the same as the 23 # render directory. 24 dir="/tmp/`basename $render_dir`" 25 26 # Get the versioned VTK library directory (e.g. "vtk-5.6") 27 vtkdir="`basename $vtk_lib_dir`" 28 29 PATH=${dir}/bin:$PATH 30 LD_LIBRARY_PATH=${dir}/lib:${dir}/lib/${vtkdir}:$LD_LIBRARY_PATH 31 PYMOL_PATH=${dir}/lib/pymol 24 PYMOL_PATH=${libdir}/pymol 25 # lspci is either in /sbin or /usr/sbin 26 PATH=/sbin:/usr/sbin:${PATH} 32 27 33 28 export PATH LD_LIBRARY_PATH PYMOL_PATH … … 39 34 nvideo=`lspci | fgrep VGA | fgrep nVidia | wc -l` 40 35 41 nanoscale="${ dir}/bin/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast"42 nanovis="${ dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"43 vtkvis="${ dir}/bin/vtkvis"44 pymolproxy="${ dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"36 nanoscale="${bindir}/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast" 37 nanovis="${bindir}/nanovis -p ${libdir}/shaders:${libdir}/resources" 38 vtkvis="${bindir}/vtkvis" 39 pymolproxy="${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0" 45 40 46 # Copy from render directory if the run copy doesn't already exist. 47 # Otherwise use what's there. This means that successive invocations 48 # of nanoscale won't create their own run directories (only the first 49 # one will). 50 51 if test -d "$dir" ; then 52 echo "Reusing previously installed version from $render_dir" 53 else 54 echo "Copying rappture from $render_dir" 55 mkdir -p $dir 56 tar -C ${render_dir} -clf - . | tar -C $dir -xpf - 57 fi 58 59 cd ${dir} 41 cd /tmp 60 42 61 43 # Don't let nanoscale and the visualization servers run away. … … 64 46 ulimit -t $(expr ${minutes} \* 60 ) 65 47 66 echo "$nanoscale -l $nanovis_port -c \"$nanovis\" -l $pymol_port -c \"$pymolproxy\"" 67 $nanoscale -l $nanovis_port -c "$nanovis" -l $vtkvis_port -c "$vtkvis" -l $pymol_port -c "$pymolproxy" 48 set -xv 49 echo `ldd $vtkvis` 50 exec $nanoscale \ 51 -l $nanovis_port -c "$nanovis" \ 52 -l $vtkvis_port -c "$vtkvis" \ 53 -l $pymol_port -c "$pymolproxy" 68 54 55
Note: See TracChangeset
for help on using the changeset viewer.