Various BUDA-related bugs and enhancements

- client: include resource_usage in  WORKUNIT::write()
- docker_wrapper: on Mac need to use full paths for mounts.
    But on Win, full path includes :, which breaks the -v command!
    So use . for current dir
- client: add sub_appname to WORKUNIT.
    This is the BUDA app long name.
- create_work: add --sub_appname arg; adds it to the <workunit>
- buda_submit.php: pass --sub_appname to create_work

Author: davidpanderson

client/client_types.cpp

@@ -797,7 +797,11 @@ void RESOURCE_USAGE::clear() {
     missing_coproc_name[0] = 0;
 }
 
-void RESOURCE_USAGE::check_gpu(char* plan_class) {
+// see if we have the GPU libraries (OpenCL/CUDA/CAL)
+// required by the plan class.
+// If not, set missing_coproc
+//
+void RESOURCE_USAGE::check_gpu_libs(char* plan_class) {
     int rt = rsc_type;
     if (!rt) return;
     if (strstr(plan_class, "opencl")) {
@@ -827,6 +831,41 @@ void RESOURCE_USAGE::check_gpu(char* plan_class) {
     }
 }
 
+void RESOURCE_USAGE::write(MIOFILE& out) {
+    out.printf(
+        "    <avg_ncpus>%f</avg_ncpus>\n"
+        "    <flops>%f</flops>\n",
+        avg_ncpus,
+        flops
+    );
+    if (rsc_type) {
+        out.printf(
+            "    <coproc>\n"
+            "        <type>%s</type>\n"
+            "        <count>%f</count>\n"
+            "    </coproc>\n",
+            rsc_name(rsc_type),
+            coproc_usage
+        );
+    }
+    if (missing_coproc && strlen(missing_coproc_name)) {
+        out.printf(
+            "    <coproc>\n"
+            "        <type>%s</type>\n"
+            "        <count>%f</count>\n"
+            "    </coproc>\n",
+            missing_coproc_name,
+            coproc_usage
+        );
+    }
+    if (gpu_ram) {
+        out.printf(
+            "    <gpu_ram>%f</gpu_ram>\n",
+            gpu_ram
+        );
+    }
+}
+
 void APP_VERSION::init() {
     safe_strcpy(app_name, "");
     version_num = 0;
@@ -858,7 +897,7 @@ int APP_VERSION::parse(XML_PARSER& xp) {
     init();
     while (!xp.get_tag()) {
         if (xp.match_tag("/app_version")) {
-            resource_usage.check_gpu(plan_class);
+            resource_usage.check_gpu_libs(plan_class);
             if (resource_usage.rsc_type || is_wrapper) {
                 dont_throttle = true;
             }
@@ -944,14 +983,10 @@ int APP_VERSION::write(MIOFILE& out, bool write_file_info) {
         "<app_version>\n"
         "    <app_name>%s</app_name>\n"
         "    <version_num>%d</version_num>\n"
-        "    <platform>%s</platform>\n"
-        "    <avg_ncpus>%f</avg_ncpus>\n"
-        "    <flops>%f</flops>\n",
+        "    <platform>%s</platform>\n",
         app_name,
         version_num,
-        platform,
-        resource_usage.avg_ncpus,
-        resource_usage.flops
+        platform
     );
     if (strlen(plan_class)) {
         out.printf("    <plan_class>%s</plan_class>\n", plan_class);
@@ -971,32 +1006,7 @@ int APP_VERSION::write(MIOFILE& out, bool write_file_info) {
             if (retval) return retval;
         }
     }
-    if (resource_usage.rsc_type) {
-        out.printf(
-            "    <coproc>\n"
-            "        <type>%s</type>\n"
-            "        <count>%f</count>\n"
-            "    </coproc>\n",
-            rsc_name(resource_usage.rsc_type),
-            resource_usage.coproc_usage
-        );
-    }
-    if (resource_usage.missing_coproc && strlen(resource_usage.missing_coproc_name)) {
-        out.printf(
-            "    <coproc>\n"
-            "        <type>%s</type>\n"
-            "        <count>%f</count>\n"
-            "    </coproc>\n",
-            resource_usage.missing_coproc_name,
-            resource_usage.coproc_usage
-        );
-    }
-    if (resource_usage.gpu_ram) {
-        out.printf(
-            "    <gpu_ram>%f</gpu_ram>\n",
-            resource_usage.gpu_ram
-        );
-    }
+    resource_usage.write(out);
     if (dont_throttle) {
         out.printf(
             "    <dont_throttle/>\n"
@@ -1172,7 +1182,7 @@ int WORKUNIT::parse(XML_PARSER& xp) {
                 || resource_usage.rsc_type!=0
                 || resource_usage.missing_coproc;
             if (has_resource_usage) {
-                resource_usage.check_gpu(plan_class);
+                resource_usage.check_gpu_libs(plan_class);
             }
             return 0;
         }
@@ -1203,6 +1213,7 @@ int WORKUNIT::parse(XML_PARSER& xp) {
             continue;
         }
         if (xp.parse_str("plan_class", plan_class, sizeof(plan_class))) continue;
+        if (xp.parse_str("sub_appname", sub_appname, sizeof(sub_appname))) continue;
         if (xp.parse_double("avg_ncpus", resource_usage.avg_ncpus)) continue;
         if (xp.parse_double("flops", dtemp)) {
             if (dtemp <= 0) {
@@ -1286,6 +1297,13 @@ int WORKUNIT::write(MIOFILE& out, bool gui) {
     for (i=0; i<input_files.size(); i++) {
         input_files[i].write(out);
     }
+    if (strlen(sub_appname)) {
+        out.printf(
+            "    <sub_appname>%s</sub_appname>\n",
+            sub_appname
+        );
+    }
+    resource_usage.write(out);
 
     if (!job_keyword_ids.empty()) {
         if (gui) {

client/client_types.h

@@ -330,7 +330,8 @@ struct RESOURCE_USAGE {
     char missing_coproc_name[256];
 
     void clear();
-    void check_gpu(char* plan_class);
+    void check_gpu_libs(char* plan_class);
+    void write(MIOFILE&);
 };
 
 // if you add anything, initialize it in init()
@@ -407,10 +408,14 @@ struct WORKUNIT {
     int version_num;
         // Deprecated, but need to keep around to let people revert
         // to versions before multi-platform support
-    bool has_resource_usage;
+
+    // the following for BUDA jobs
+    char sub_appname[256];
     char plan_class[256];
-        // for BUDA jobs, the BUDA variant
+        // the BUDA variant
+    bool has_resource_usage;
     RESOURCE_USAGE resource_usage;
+
     std::string command_line;
     std::vector<FILE_REF> input_files;
     PROJECT* project;
@@ -423,10 +428,11 @@ struct WORKUNIT {
     JOB_KEYWORD_IDS job_keyword_ids;
 
     WORKUNIT(){
-        safe_strcpy(name, "");
-        safe_strcpy(app_name, "");
+        name[0] = 0;
+        app_name[0] = 0;
         version_num = 0;
         has_resource_usage = false;
+        sub_appname[0] = 0;
         plan_class[0] = 0;
         resource_usage.clear();
         command_line.clear();

html/user/buda_submit.php

@@ -21,6 +21,7 @@
 require_once('../inc/util.inc');
 require_once('../inc/submit_util.inc');
 require_once('../inc/sandbox.inc');
+require_once('../inc/buda.inc');
 
 display_errors();
 
@@ -191,7 +192,7 @@ function stage_input_files($batch_dir, $batch_desc, $batch_id) {
 // Use --stdin, where each job is described by a line
 //
 function create_jobs(
-    $app, $variant, $variant_desc,
+    $app, $app_desc, $variant, $variant_desc,
     $batch_desc, $batch_id, $batch_dir_name,
     $wrapper_verbose, $cmdline
 ) {
@@ -221,15 +222,17 @@ function create_jobs(
         }
         $job_cmds .= "$job_cmd\n";
     }
-    $cw_cmdline = sprintf('"--dockerfile %s %s %s"',
+    $wrapper_cmdline = sprintf('"--dockerfile %s %s %s"',
         $variant_desc->dockerfile,
         $wrapper_verbose?'--verbose':'',
         $cmdline
     );
     $cmd = sprintf(
-        'cd ../..; bin/create_work --appname %s --batch %d --stdin --command_line %s --wu_template %s --result_template %s',
-        $buda_boinc_app->name, $batch_id,
-        $cw_cmdline,
+        'cd ../..; bin/create_work --appname %s --sub_appname "%s" --batch %d --stdin --command_line %s --wu_template %s --result_template %s',
+        $buda_boinc_app->name,
+        $app_desc->long_name,
+        $batch_id,
+        $wrapper_cmdline,
         "buda_apps/$app/$variant/template_in",
         "buda_apps/$app/$variant/template_out"
     );
@@ -250,6 +253,8 @@ function create_jobs(
 }
 
 function handle_submit($user) {
+    global $buda_root;
+
     $app = get_str('app');
     if (!is_valid_filename($app)) die('bad arg');
     $variant = get_str('variant');
@@ -259,7 +264,9 @@ function handle_submit($user) {
     $wrapper_verbose = get_str('wrapper_verbose', true);
     $cmdline = get_str('cmdline');
 
-    $variant_dir = "../../buda_apps/$app/$variant";
+    $app_desc = get_buda_desc($app);
+
+    $variant_dir = "$buda_root/$app/$variant";
     $variant_desc = json_decode(
         file_get_contents("$variant_dir/variant.json")
     );
@@ -280,7 +287,7 @@ function handle_submit($user) {
     stage_input_files($batch_dir, $batch_desc, $batch->id);
 
     create_jobs(
-        $app, $variant, $variant_desc,
+        $app, $app_desc, $variant, $variant_desc,
         $batch_desc, $batch->id, $batch_dir_name,
         $wrapper_verbose, $cmdline
     );

samples/docker_wrapper/docker_wrapper.cpp

@@ -375,8 +375,13 @@ int create_container() {
     if (retval) return retval;
 
     // on MacOS/podman, you need the full path, not .
+    // Win: use . since full path has :
     //
+#ifdef __APPLE__
     getcwd(cwd, sizeof(cwd));
+#else
+    strcpy(cwd, ".");
+#endif
     snprintf(slot_cmd, sizeof(slot_cmd), " -v %s:%s", cwd, config.workdir.c_str());
     if (config.project_dir_mount.empty()) {
         project_cmd[0] = 0;

tools/backend_lib.cpp

@@ -15,6 +15,9 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// functions called from backend programs (scheduler, transitioner etc.)
+// to create result records and other utilities
+
 #include "config.h"
 #include "boinc_stdio.h"
 #include <cstdlib>
@@ -28,7 +31,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-
 #include "boinc_db.h"
 #include "common_defs.h"
 #include "crypt.h"

tools/create_work.cpp

@@ -96,6 +96,7 @@ void usage() {
         "   [ --rsc_memory_bound x ]\n"
         "   [ --size_class n ]\n"
         "   [ --stdin ]\n"
+        "   [ --sub_appname 'foo bar' ]\n"
         "   [ --target_host ID ]\n"
         "   [ --target_nresults n ]\n"
         "   [ --target_team ID ]\n"
@@ -143,16 +144,18 @@ struct JOB_DESC {
     bool assign_multi;
     int assign_id;
     int assign_type;
+    char sub_appname[256];
 
     JOB_DESC() {
         wu.clear();
-        strcpy(command_line, "");
+        command_line[0] = 0;
         assign_flag = false;
         assign_multi = false;
-        strcpy(wu_template_file, "");
-        strcpy(result_template_file, "");
+        wu_template_file[0] = 0;
+        result_template_file[0] = 0;
         assign_id = 0;
         assign_type = ASSIGN_NONE;
+        sub_appname[0] = 0;
 
         // defaults (in case they're not in WU template)
         //
@@ -312,8 +315,6 @@ int main(int argc, char** argv) {
             jd.wu.max_total_results = atoi(argv[++i]);
         } else if (arg(argv, i, "max_success_results")) {
             jd.wu.max_success_results = atoi(argv[++i]);
-        } else if (arg(argv, i, "opaque")) {
-            jd.wu.opaque = atoi(argv[++i]);
         } else if (arg(argv, i, "command_line")) {
             strcpy(jd.command_line, argv[++i]);
         } else if (arg(argv, i, "wu_id")) {
@@ -367,6 +368,8 @@ int main(int argc, char** argv) {
             continue_on_error = true;
         } else if (arg(argv, i, "keywords")) {
             strcpy(jd.wu.keywords, argv[++i]);
+        } else if (arg(argv, i, "sub_appname")) {
+            strcpy(jd.sub_appname, argv[++i]);
         } else {
             if (!strncmp("-", argv[i], 1)) {
                 fprintf(stderr, "create_work: bad argument '%s'\n", argv[i]);
@@ -578,14 +581,23 @@ void JOB_DESC::create() {
     if (assign_flag) {
         wu.transitioner_flags = assign_multi?TRANSITION_NONE:TRANSITION_NO_NEW_RESULTS;
     }
+    char sub_appname_buf[256];
+    sub_appname_buf[0] = 0;
+    if (strlen(sub_appname)) {
+        snprintf(sub_appname_buf, sizeof(sub_appname_buf),
+            "   <sub_appname>%s</sub_appname>",
+            sub_appname
+        );
+    }
     int retval = create_work2(
         wu,
         wu_template,
         result_template_file,
         result_template_path,
         infiles,
         config,
-        command_line
+        command_line,
+        sub_appname_buf
     );
     if (retval) {
         fprintf(stderr, "create_work: %s\n", boincerror(retval));