Update docs from e64ba0a

microsoft · Aug 14, 2024 · 3dd2f81 · 3dd2f81
1 parent 843a968
commit 3dd2f81
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/_modules/olive/engine/engine.html b/_modules/olive/engine/engine.html
@@ -140,7 +140,6 @@ <h1>Source code for olive.engine.engine</h1><div class="highlight"><pre>
 <span class="kn">import</span> <span class="nn">time</span>
 <span class="kn">from</span> <span class="nn">collections</span> <span class="kn">import</span> <span class="n">OrderedDict</span><span class="p">,</span> <span class="n">defaultdict</span>
 <span class="kn">from</span> <span class="nn">contextlib</span> <span class="kn">import</span> <span class="n">contextmanager</span>
-<span class="kn">from</span> <span class="nn">copy</span> <span class="kn">import</span> <span class="n">deepcopy</span>
 <span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">datetime</span>
 <span class="kn">from</span> <span class="nn">pathlib</span> <span class="kn">import</span> <span class="n">Path</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">TYPE_CHECKING</span><span class="p">,</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Dict</span><span class="p">,</span> <span class="n">List</span><span class="p">,</span> <span class="n">Optional</span><span class="p">,</span> <span class="n">Tuple</span><span class="p">,</span> <span class="n">Type</span><span class="p">,</span> <span class="n">Union</span>
@@ -457,8 +456,6 @@ <h1>Source code for olive.engine.engine</h1><div class="highlight"><pre>
         <span class="n">input_model_id</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_init_input_model</span><span class="p">(</span><span class="n">input_model_config</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">footprints</span><span class="p">[</span><span class="n">accelerator_spec</span><span class="p">]</span><span class="o">.</span><span class="n">record</span><span class="p">(</span><span class="n">model_id</span><span class="o">=</span><span class="n">input_model_id</span><span class="p">)</span>
         <span class="n">prefix_output_name</span> <span class="o">=</span> <span class="n">Engine</span><span class="o">.</span><span class="n">_get_prefix_output_name</span><span class="p">(</span><span class="n">output_name</span><span class="p">,</span> <span class="n">accelerator_spec</span><span class="p">)</span>
-        <span class="k">if</span> <span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">enable_cloud_cache</span><span class="p">:</span>
-            <span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">input_model_config</span> <span class="o">=</span> <span class="n">deepcopy</span><span class="p">(</span><span class="n">input_model_config</span><span class="p">)</span>
 
         <span class="k">try</span><span class="p">:</span>
             <span class="k">if</span> <span class="n">evaluate_input_model</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">evaluator_config</span><span class="p">:</span>
@@ -935,7 +932,7 @@ <h1>Source code for olive.engine.engine</h1><div class="highlight"><pre>
         <span class="n">output_model_hash</span> <span class="o">=</span> <span class="kc">None</span>
 
         <span class="k">if</span> <span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">enable_cloud_cache</span><span class="p">:</span>
-            <span class="k">if</span> <span class="ow">not</span> <span class="n">is_valid_cloud_cache_model</span><span class="p">(</span><span class="n">model_config</span><span class="p">):</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">input_model_identifier</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">is_valid_cloud_cache_model</span><span class="p">(</span><span class="n">model_config</span><span class="p">):</span>
                 <span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
                     <span class="s2">&quot;Only HfModel with huggingface id as model_path &quot;</span>
                     <span class="s2">&quot;or HfModel from Azure ML registry model and Azure ML curated model &quot;</span>

diff --git a/_modules/olive/systems/azureml/aml_system.html b/_modules/olive/systems/azureml/aml_system.html
@@ -289,6 +289,15 @@ <h1>Source code for olive.systems.azureml.aml_system</h1><div class="highlight">
         <span class="n">cur_dir</span> <span class="o">=</span> <span class="n">Path</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</span><span class="o">.</span><span class="n">resolve</span><span class="p">()</span><span class="o">.</span><span class="n">parent</span>
         <span class="n">code_files</span> <span class="o">=</span> <span class="p">[</span><span class="n">cur_dir</span> <span class="o">/</span> <span class="n">script_name</span><span class="p">]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">copy_files</span><span class="p">(</span><span class="n">code_files</span><span class="p">,</span> <span class="n">config_root</span><span class="p">)</span>
+
+        <span class="k">if</span> <span class="n">run_config</span><span class="o">.</span><span class="n">input_model</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;model_path&quot;</span><span class="p">):</span>
+            <span class="n">input_model_resource_path</span> <span class="o">=</span> <span class="n">create_resource_path</span><span class="p">(</span><span class="n">run_config</span><span class="o">.</span><span class="n">input_model</span><span class="o">.</span><span class="n">config</span><span class="p">[</span><span class="s2">&quot;model_path&quot;</span><span class="p">])</span>
+            <span class="k">if</span> <span class="p">(</span>
+                <span class="n">input_model_resource_path</span><span class="o">.</span><span class="n">is_azureml_models</span><span class="p">()</span>
+                <span class="ow">and</span> <span class="n">run_config</span><span class="o">.</span><span class="n">engine</span><span class="o">.</span><span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">enable_cloud_cache</span>
+            <span class="p">):</span>
+                <span class="n">run_config</span><span class="o">.</span><span class="n">engine</span><span class="o">.</span><span class="n">cloud_cache_config</span><span class="o">.</span><span class="n">input_model_identifier</span> <span class="o">=</span> <span class="n">input_model_resource_path</span><span class="o">.</span><span class="n">get_path</span><span class="p">()</span>
+
         <span class="n">workflow_config</span> <span class="o">=</span> <span class="n">run_config</span><span class="o">.</span><span class="n">to_json</span><span class="p">(</span><span class="n">make_absolute</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
         <span class="p">[</span>
             <span class="n">workflow_config</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="n">component</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
@@ -298,7 +307,7 @@ <h1>Source code for olive.systems.azureml.aml_system</h1><div class="highlight">
         <span class="n">inputs</span><span class="p">,</span> <span class="n">args</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">create_inputs_and_args</span><span class="p">(</span>
             <span class="p">{</span><span class="n">WORKFLOW_CONFIG</span><span class="p">:</span> <span class="n">workflow_config</span><span class="p">},</span>
             <span class="n">tmp_dir</span><span class="p">,</span>
-            <span class="n">ignore_keys</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;cache_dir&quot;</span><span class="p">,</span> <span class="s2">&quot;output_dir&quot;</span><span class="p">,</span> <span class="s2">&quot;model_attributes&quot;</span><span class="p">],</span>
+            <span class="n">ignore_keys</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;cache_dir&quot;</span><span class="p">,</span> <span class="s2">&quot;cloud_cache_config&quot;</span><span class="p">,</span> <span class="s2">&quot;output_dir&quot;</span><span class="p">,</span> <span class="s2">&quot;model_attributes&quot;</span><span class="p">],</span>
         <span class="p">)</span>
 
         <span class="n">outputs</span> <span class="o">=</span> <span class="p">{</span>
@@ -404,7 +413,10 @@ <h1>Source code for olive.systems.azureml.aml_system</h1><div class="highlight">
             <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_load_model</span><span class="p">(</span><span class="n">model_config</span><span class="o">.</span><span class="n">to_json</span><span class="p">(</span><span class="n">check_object</span><span class="o">=</span><span class="kc">True</span><span class="p">),</span> <span class="n">output_model_path</span><span class="p">,</span> <span class="n">pipeline_output_path</span><span class="p">)</span>
 
     <span class="k">def</span> <span class="nf">create_inputs_and_args</span><span class="p">(</span>
-        <span class="bp">self</span><span class="p">,</span> <span class="n">all_configs</span><span class="p">:</span> <span class="n">Dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Dict</span><span class="p">],</span> <span class="n">tmp_dir</span><span class="p">:</span> <span class="n">Path</span><span class="p">,</span> <span class="n">ignore_keys</span><span class="p">:</span> <span class="n">Optional</span><span class="p">[</span><span class="n">List</span><span class="p">[</span><span class="nb">str</span><span class="p">]]</span> <span class="o">=</span> <span class="kc">None</span>
+        <span class="bp">self</span><span class="p">,</span>
+        <span class="n">all_configs</span><span class="p">:</span> <span class="n">Dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Dict</span><span class="p">],</span>
+        <span class="n">tmp_dir</span><span class="p">:</span> <span class="n">Path</span><span class="p">,</span>
+        <span class="n">ignore_keys</span><span class="p">:</span> <span class="n">Optional</span><span class="p">[</span><span class="n">List</span><span class="p">[</span><span class="nb">str</span><span class="p">]]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
     <span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Create inputs and args for a job.</span>
 

diff --git a/schema.json b/schema.json
@@ -633,8 +633,9 @@
           "default": true,
           "type": "boolean"
         },
-        "input_model_config": {
-          "$ref": "#/definitions/ModelConfig"
+        "input_model_identifier": {
+          "title": "Input Model Identifier",
+          "type": "string"
         }
       }
     },