自作なのでご留意下さい

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
diff -ru ./relion-1.4.orig/INSTALL.sh relion-1.4/INSTALL.sh
--- ./relion-1.4.orig/INSTALL.sh        2015-07-28 23:26:25.000000000 +0900
+++ relion-1.4/INSTALL.sh       2017-01-12 01:20:35.515412939 +0900
@@ -1,8 +1,8 @@
 #!/usr/bin/env sh
 
 #Some flags variables
-BUILD_FFTW=true
-BUILD_FLTK=true
+BUILD_FFTW=false
+BUILD_FLTK=false
 BUILD_RELION=true
 N_THREADS=$@
 
diff -ru ./relion-1.4.orig/configure relion-1.4/configure
--- ./relion-1.4.orig/configure 2015-09-01 19:14:49.000000000 +0900
+++ relion-1.4/configure        2017-01-12 01:19:04.286566979 +0900
@@ -15846,7 +15846,7 @@
 #Check for FLTK
 # as g++ seems needed and not gcc for compilation,
 #just check for presence of fltk-config program
-fltkfile=`pwd`/bin/fltk-config
+fltkfile=/Appl/relion-1.4.0-d-170112/bin/fltk-config
 as_ac_File=`$as_echo "ac_cv_file_$fltkfile" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $fltkfile" >&5
 $as_echo_n "checking for $fltkfile... " >&6; }
diff -ru ./relion-1.4.orig/src/displayer.h relion-1.4/src/displayer.h
--- ./relion-1.4.orig/src/displayer.h   2015-06-05 17:35:30.000000000 +0900
+++ relion-1.4/src/displayer.h  2017-01-12 01:21:48.942483664 +0900
@@ -29,18 +29,18 @@
 #include <src/time.h>
 #include <src/args.h>
 
-#include <external/fltk-1.3.0/FL/Fl.H>
-#include <external/fltk-1.3.0/FL/Fl_Shared_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_Double_Window.H>
-#include <external/fltk-1.3.0/FL/Fl_Scroll.H>
-#include <external/fltk-1.3.0/FL/Fl_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_JPEG_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_Box.H>
-#include <external/fltk-1.3.0/FL/fl_draw.H>
-#include <external/fltk-1.3.0/FL/Fl_Menu_Bar.H>
-#include <external/fltk-1.3.0/FL/Fl_File_Chooser.H>
-#include <external/fltk-1.3.0/FL/Fl_Float_Input.H>
-#include <external/fltk-1.3.0/FL/Fl_Text_Display.H>
+#include <FL/Fl.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Scroll.H>
+#include <FL/Fl_Image.H>
+#include <FL/Fl_JPEG_Image.H>
+#include <FL/Fl_Box.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Menu_Bar.H>
+#include <FL/Fl_File_Chooser.H>
+#include <FL/Fl_Float_Input.H>
+#include <FL/Fl_Text_Display.H>
 
 #define GUI_BACKGROUND_COLOR (fl_rgb_color(240,240,240))
 #define GUI_INPUT_COLOR (fl_rgb_color(255,255,230))
diff -ru ./relion-1.4.orig/src/gui_jobwindow.cpp relion-1.4/src/gui_jobwindow.cpp
--- ./relion-1.4.orig/src/gui_jobwindow.cpp     2015-09-02 02:17:43.000000000 +0900
+++ relion-1.4/src/gui_jobwindow.cpp    2017-01-12 01:29:13.416850766 +0900
@@ -120,7 +120,10 @@
     resetHeight();
 
        if (has_mpi)
+       {
+               nr_nodes.place(current_y, "Number of nodes:", 1, 1, 16, 1, "Number of nodes to use in parallel.");
                nr_mpi.place(current_y, "Number of MPI procs:", 1, 1, 64, 1, "Number of MPI nodes to use in parallel. When set to 1, MPI will not be used.");
+       }
 
        if (has_thread)
        {
@@ -270,7 +273,10 @@
 void RelionJobWindow::closeWriteFile(std::ofstream& fh)
 {
        if (has_mpi)
+       {
+               nr_nodes.writeValue(fh);
                nr_mpi.writeValue(fh);
+       }
        if (has_thread)
        {
                nr_threads.writeValue(fh);
@@ -316,7 +322,7 @@
 
        // Open the standard job submission file
        int errno;
-       if (errno = textbuf->loadfile(qsubscript.getValue().c_str()))
+       if (errno == textbuf->loadfile(qsubscript.getValue().c_str()))
            fl_alert("Error reading from file \'%s\':\n%s.", qsubscript.getValue().c_str(), strerror(errno));
 
        // default to a single thread
@@ -332,12 +338,13 @@
                std::cout << " Warning! You're using " << nmpi << " MPI processes with " << nthr << " threads each (i.e. " << ncores << " cores), while asking for " << nnodes << " nodes with " << ndedi << " cores." << std::endl;
                std::cout << " It is more efficient to make the number of cores (i.e. mpi*threads) a multiple of the minimum number of dedicated cores per node " << std::endl;
        }
-
+       replaceStringAll(textbuf, "XXXnodesXXX", floatToString(nr_nodes.getValue()) );
+       replaceStringAll(textbuf, "XXXsumXXX", floatToString(     nr_nodes.getValue() * ncores ));
+       replaceStringAll(textbuf, "XXXmpiprocXXX", floatToString( nr_nodes.getValue() * nmpi ));
        replaceStringAll(textbuf, "XXXmpinodesXXX", floatToString(nmpi) );
        replaceStringAll(textbuf, "XXXthreadsXXX", floatToString(nthr) );
        replaceStringAll(textbuf, "XXXcoresXXX", floatToString(ncores) );
        replaceStringAll(textbuf, "XXXdedicatedXXX", floatToString(ndedi) );
-       replaceStringAll(textbuf, "XXXnodesXXX", floatToString(nnodes) );
        replaceStringAll(textbuf, "XXXnameXXX", outputname);
        replaceStringAll(textbuf, "XXXerrfileXXX", outputname + ".err");
        replaceStringAll(textbuf, "XXXoutfileXXX", outputname + ".out");
@@ -358,7 +365,7 @@
        textbuf->append("\n");
 
        // Save the modified job submission script using a local name
-       if (errno = textbuf->savefile(newfilename.c_str()))
+       if (errno == textbuf->savefile(newfilename.c_str()))
            fl_alert("Error writing to file \'%s\':\n%s.", newfilename.c_str(), strerror(errno));
 
 }
diff -ru ./relion-1.4.orig/src/gui_jobwindow.h relion-1.4/src/gui_jobwindow.h
--- ./relion-1.4.orig/src/gui_jobwindow.h       2015-08-27 19:20:56.000000000 +0900
+++ relion-1.4/src/gui_jobwindow.h      2017-01-12 01:24:32.641410595 +0900
@@ -76,6 +76,7 @@
 
        // Running
        Fl_Group *queue_group;
+       SliderEntry nr_nodes;
        SliderEntry nr_mpi;
        SliderEntry nr_threads;
        SliderEntry ram_per_thread;
diff -ru ./relion-1.4.orig/src/image.h relion-1.4/src/image.h
--- ./relion-1.4.orig/src/image.h       2015-06-05 17:35:30.000000000 +0900
+++ relion-1.4/src/image.h      2017-01-12 01:23:54.225897250 +0900
@@ -1044,7 +1044,7 @@
             wmChar = "w";
             break;
         case WRITE_APPEND:
-            if (_exists = exists(fileName))
+            if (_exists == exists(fileName))
                 wmChar = "r+";
             else
                 wmChar = "w+";
diff -ru ./relion-1.4.orig/src/manualpicker.h relion-1.4/src/manualpicker.h
--- ./relion-1.4.orig/src/manualpicker.h        2015-06-05 17:35:30.000000000 +0900
+++ relion-1.4/src/manualpicker.h       2017-01-12 01:22:49.295719569 +0900
@@ -24,18 +24,18 @@
 #include "src/args.h"
 #include "src/filename.h"
 #include "src/gui_entries.h"
-#include <external/fltk-1.3.0/FL/Fl.H>
-#include <external/fltk-1.3.0/FL/Fl_Shared_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_Double_Window.H>
-#include <external/fltk-1.3.0/FL/Fl_Scroll.H>
-#include <external/fltk-1.3.0/FL/Fl_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_JPEG_Image.H>
-#include <external/fltk-1.3.0/FL/Fl_Box.H>
-#include <external/fltk-1.3.0/FL/fl_draw.H>
-#include <external/fltk-1.3.0/FL/Fl_Menu_Bar.H>
-#include <external/fltk-1.3.0/FL/Fl_File_Chooser.H>
-#include <external/fltk-1.3.0/FL/Fl_Float_Input.H>
-#include <external/fltk-1.3.0/FL/Fl_Text_Display.H>
+#include <FL/Fl.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Scroll.H>
+#include <FL/Fl_Image.H>
+#include <FL/Fl_JPEG_Image.H>
+#include <FL/Fl_Box.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Menu_Bar.H>
+#include <FL/Fl_File_Chooser.H>
+#include <FL/Fl_Float_Input.H>
+#include <FL/Fl_Text_Display.H>
 
 #define MWCOL1 300
 #define MWCOL2 60

トップ   編集 添付 複製 名前変更     ヘルプ   最終更新のRSS
Last-modified: 2017-01-12 (木) 01:44:42 (1308d)