Merge pull request 'V20220718.patch合入develop' (#2570) from V20220718.patch into develop

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2570

modules/storage/minio_ext.go

@@ -187,9 +187,6 @@ func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, rel
 			if val.Key == Prefix {
 				continue
 			}
-			if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") {
-				continue
-			}
 			if strings.HasSuffix(val.Key, "/") {
 				isDir = true
 				fileName = val.Key[prefixLen : len(val.Key)-1]

templates/repo/cloudbrain/inference/new.tmpl

@@ -322,7 +322,7 @@
                 loadCheckpointList(dataID).then((res)=>{
                     res.forEach(element => {
                         const ckptSuffix = element.FileName.split(".")
-                        const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7']
+                        const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7','pdparams','onnx','pbtxt','keras','mlmodel','cfg','pt']
                         if(!element.IsDir && loadCheckpointFile.includes(ckptSuffix[ckptSuffix.length-1])){
                             html += `<div class="item" data-value=${element.FileName}>${element.FileName}</div>`
                         }

templates/repo/modelarts/inferencejob/new.tmpl

@@ -339,7 +339,7 @@
                 loadCheckpointList(dataID).then((res)=>{
                     res.forEach(element => {
                         const ckptSuffix = element.FileName.split(".")
-                        const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7']
+                        const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7','pdparams','onnx','pbtxt','keras','mlmodel','cfg','pt']
                         if(!element.IsDir && loadCheckpointFile.includes(ckptSuffix[ckptSuffix.length-1])){
                             html += `<div class="item" data-value=${element.FileName}>${element.FileName}</div>`
                         }

web_src/js/features/cloudbrainShow.js

@@ -175,7 +175,9 @@ export default async function initCloudrainSow() {
     let url = `/api/v1/repos${path}?version_name=${version_name}&parentDir=${parents}`;
     $.get(url, (data) => {
       $(`#dir_list${version_name}`).empty();
-      renderDir(path, data, version_name, downloadFlag, gpuFlag);
+      if(data.Dirs){
+      	renderDir(path, data, version_name, downloadFlag, gpuFlag);
+      }
       if (init === "init") {
         $(`input[name=model${version_name}]`).val("");
         $(`input[name=modelback${version_name}]`).val(version_name);
@@ -189,7 +191,7 @@ export default async function initCloudrainSow() {
         htmlBread += "<div class='divider'> / </div>";
         $(`#file_breadcrumb${version_name}`).append(htmlBread);
       } else {
-        renderBrend(path, version_name, parents, filename, init, downloadFlag);
+        renderBrend(path, version_name, parents, filename, init, downloadFlag,gpuFlag);
       }
     }).fail(function (err) {
       console.log(err, version_name);
@@ -223,7 +225,8 @@ export default async function initCloudrainSow() {
     parents,
     filename,
     init,
-    downloadFlag
+    downloadFlag,
+    gpuFlag
   ) {
     if (init == "folder") {
       let htmlBrend = "";
@@ -234,11 +237,11 @@ export default async function initCloudrainSow() {
       let filename1 = $(`input[name=modelback${version_name}]`).val();
       if (parents1 === "") {
         $(`#file_breadcrumb${version_name} .active.section`).replaceWith(
-          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='' data-init='init'>${sectionName}</a>`
+          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-gpu-flag='${gpuFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='' data-init='init'>${sectionName}</a>`
         );
       } else {
         $(`#file_breadcrumb${version_name} .active.section`).replaceWith(
-          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='${filename1}'>${sectionName}</a>`
+          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-gpu-flag='${gpuFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='${filename1}'>${sectionName}</a>`
         );
       }
 
@@ -279,7 +282,7 @@ export default async function initCloudrainSow() {
       html += "<span class='octicon octicon-file-directory'>";
       html += "</span>";
       if (data.Dirs[i].IsDir) {
-        html += `<a  class='load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${data.Dirs[i].ParenDir}' data-filename='${data.Dirs[i].FileName}' data-init='folder'>`;
+        html += `<a  class='load-model-file' data-download-flag='${downloadFlag}' data-gpu-flag='${gpuFlag}' data-path='${path}' data-version='${version_name}' data-parents='${data.Dirs[i].ParenDir}' data-filename='${data.Dirs[i].FileName}' data-init='folder'>`;
         html +=
           "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" +
           data.Dirs[i].FileName +