deploy: 45f64e0

GoogleCloudPlatform · Jun 26, 2024 · 76a5621 · 76a5621
1 parent 0ae4d01
commit 76a5621
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.doctrees/environment.pickle b/.doctrees/environment.pickle
diff --git a/_modules/ramble/application.html b/_modules/ramble/application.html
@@ -1339,7 +1339,7 @@ <h1>Source code for ramble.application</h1><div class="highlight"><pre>
                 <span class="n">input_path</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">expander</span><span class="o">.</span><span class="n">expand_var</span><span class="p">(</span>
                     <span class="n">input_conf</span><span class="p">[</span><span class="s2">&quot;target_dir&quot;</span><span class="p">],</span> <span class="n">extra_vars</span><span class="o">=</span><span class="n">input_vars</span>
                 <span class="p">)</span>
-                <span class="n">input_tuple</span> <span class="o">=</span> <span class="p">(</span><span class="sa">f</span><span class="s2">&quot;input-file-</span><span class="si">{</span><span class="n">input_file</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">input_path</span><span class="p">)</span>
+                <span class="n">input_tuple</span> <span class="o">=</span> <span class="p">(</span><span class="s2">&quot;input-file&quot;</span><span class="p">,</span> <span class="n">input_path</span><span class="p">)</span>
 
                 <span class="c1"># Skip inputs that have already been cached</span>
                 <span class="k">if</span> <span class="n">workspace</span><span class="o">.</span><span class="n">check_cache</span><span class="p">(</span><span class="n">input_tuple</span><span class="p">):</span>
@@ -1352,9 +1352,10 @@ <h1>Source code for ramble.application</h1><div class="highlight"><pre>
                 <span class="k">with</span> <span class="n">ramble</span><span class="o">.</span><span class="n">stage</span><span class="o">.</span><span class="n">InputStage</span><span class="p">(</span>
                     <span class="n">input_conf</span><span class="p">[</span><span class="s2">&quot;fetcher&quot;</span><span class="p">],</span>
                     <span class="n">name</span><span class="o">=</span><span class="n">input_namespace</span><span class="p">,</span>
-                    <span class="n">path</span><span class="o">=</span><span class="n">input_path</span><span class="p">,</span>
+                    <span class="n">path</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">expander</span><span class="o">.</span><span class="n">workload_input_dir</span><span class="p">,</span>
                     <span class="n">mirror_paths</span><span class="o">=</span><span class="n">mirror_paths</span><span class="p">,</span>
                 <span class="p">)</span> <span class="k">as</span> <span class="n">stage</span><span class="p">:</span>
+                    <span class="n">stage</span><span class="o">.</span><span class="n">set_subdir</span><span class="p">(</span><span class="n">input_path</span><span class="p">)</span>
                     <span class="n">stage</span><span class="o">.</span><span class="n">fetch</span><span class="p">()</span>
                     <span class="k">if</span> <span class="n">input_conf</span><span class="p">[</span><span class="s2">&quot;fetcher&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">digest</span><span class="p">:</span>
                         <span class="n">stage</span><span class="o">.</span><span class="n">check</span><span class="p">()</span>