OpenI
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge remote-tracking branch 'origin/point-v2' into point-v2

pull/2885/head
chenyifan01 2 years ago
parent
811e02e2ee c23acc89ad
commit
3235288a94
9 changed files with 16 additions and 40 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -7
      templates/repo/cloudbrain/benchmark/show.tmpl
  2. +3
    -7
      templates/repo/cloudbrain/inference/show.tmpl
  3. +2
    -4
      templates/repo/cloudbrain/show.tmpl
  4. +3
    -7
      templates/repo/cloudbrain/trainjob/show.tmpl
  5. +1
    -3
      templates/repo/grampus/trainjob/show.tmpl
  6. +1
    -4
      templates/repo/modelarts/inferencejob/show.tmpl
  7. +1
    -4
      templates/repo/modelarts/notebook/show.tmpl
  8. +1
    -4
      templates/repo/modelarts/trainjob/show.tmpl
  9. +1
    -0
      web_src/js/standalone/specsuse.js

+ 3
- 7
templates/repo/cloudbrain/benchmark/show.tmpl View File

@@ -454,9 +454,7 @@
</td>

<td class="ti-text-form-content resorce_type">
<div class="text-span text-span-w">
{{$.resource_type}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">
@@ -465,9 +463,7 @@
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{$.resource_spec}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">
@@ -584,7 +580,7 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
$('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>
<script>


+ 3
- 7
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -341,9 +341,7 @@
{{$.i18n.Tr "repo.modelarts.train_job.resource_type"}}
</td>
<td class="ti-text-form-content resorce_type">
<div class="text-span text-span-w">
{{$.resource_type}}
</div>
<div class="text-span text-span-w"></div>
</td>

</tr>
@@ -483,9 +481,7 @@
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
</tbody>
@@ -627,6 +623,6 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
$('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>

+ 2
- 4
templates/repo/cloudbrain/show.tmpl View File

@@ -346,9 +346,7 @@
</td>

<td class="ti-text-form-content resorce_type">
<div class="text-span text-span-w">
{{$.resource_type}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">
@@ -604,6 +602,6 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
$('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>

+ 3
- 7
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -360,9 +360,7 @@
</td>

<td class="ti-text-form-content resorce_type">
<div class="text-span text-span-w">
{{$.resource_type}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">
@@ -371,9 +369,7 @@
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>

@@ -993,6 +989,6 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
$('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>

+ 1
- 3
templates/repo/grampus/trainjob/show.tmpl View File

@@ -358,9 +358,7 @@
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{.FlavorName}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">


+ 1
- 4
templates/repo/modelarts/inferencejob/show.tmpl View File

@@ -424,9 +424,7 @@ td, th {
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{.FlavorName}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
</tbody>
@@ -543,6 +541,5 @@ $(document).ready(function(){
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
// $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>

+ 1
- 4
templates/repo/modelarts/notebook/show.tmpl View File

@@ -368,9 +368,7 @@
</td>

<td class="ti-text-form-content spec">
<div class="text-span text-span-w">
{{$.resource_spec}}
</div>
<div class="text-span text-span-w"></div>
</td>
</tr>
<tr class="ti-no-ng-animate">
@@ -504,6 +502,5 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
$('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>

+ 1
- 4
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -398,9 +398,7 @@
</td>

<td class="ti-text-form-content spec{{$k}}">
<div class="text-span text-span-w">
{{.FlavorName}}
</div>
<div class="text-span text-span-w"></div>
</td>
<script>
;(function() {
@@ -414,7 +412,6 @@
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
$('td.ti-text-form-content.spec{{$k}} div').text(specStr);
// $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
})();
</script>
</tr>


+ 1
- 0
web_src/js/standalone/specsuse.js View File

@@ -9,6 +9,7 @@ window.getListValueWithKey = (list, key, k = 'k', v = 'v', defaultV = '') => {
};

window.renderSpecStr = (spec, showPoint, langObj) => {
if (!spec) return '';
var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : '';
var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB` : '';


Write Preview
Loading…
Cancel
Save