Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@ public interface DynamicWorkflowTask {
DynamicJobSpec run(Map<String, Literal> inputs);

RetryStrategy getRetries();

default Resources getResources() {
return Resources.builder().build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,8 @@ public SdkNode<OutputT> apply(
public int getRetries() {
return 0;
}

public SdkResources getResources() {
return SdkResources.empty();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.flyte.api.v1.DynamicWorkflowTaskRegistrar;
import org.flyte.api.v1.Literal;
import org.flyte.api.v1.Node;
import org.flyte.api.v1.Resources;
import org.flyte.api.v1.RetryStrategy;
import org.flyte.api.v1.TaskIdentifier;
import org.flyte.api.v1.TypedInterface;
Expand Down Expand Up @@ -112,6 +113,11 @@ public DynamicJobSpec run(Map<String, Literal> inputs) {
public RetryStrategy getRetries() {
return RetryStrategy.builder().retries(sdkDynamicWorkflow.getRetries()).build();
}

@Override
public Resources getResources() {
return sdkDynamicWorkflow.getResources().toIdl();
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.hamcrest.Matchers.hasSize;

import com.google.errorprone.annotations.Var;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.flyte.api.v1.Binding;
Expand All @@ -30,6 +31,7 @@
import org.flyte.api.v1.Literal;
import org.flyte.api.v1.OutputReference;
import org.flyte.api.v1.Primitive;
import org.flyte.api.v1.Resources;
import org.flyte.api.v1.Scalar;
import org.flyte.api.v1.TaskIdentifier;
import org.flyte.api.v1.TypedInterface;
Expand Down Expand Up @@ -70,6 +72,14 @@ void shouldLoad() {
.inputs(SdkLiteralTypes.integers().asSdkType("n").getVariableMap())
.outputs(SdkLiteralTypes.integers().asSdkType("2n").getVariableMap())
.build()));
assertThat(
dynWf.getResources(),
equalTo(
Resources.builder()
.requests(resources("0.5", "2Gi"))
.limits(resources("2", "5Gi"))
.build()));
;
var spec =
dynWf.run(Map.of("n", Literal.ofScalar(Scalar.ofPrimitive(Primitive.ofIntegerValue(3)))));
assertThat(spec.nodes(), hasSize(3));
Expand Down Expand Up @@ -103,6 +113,14 @@ public SdkBindingData<Long> run(SdkWorkflowBuilder builder, SdkBindingData<Long>
}
return x;
}

@Override
public SdkResources getResources() {
return SdkResources.builder()
.requests(sdkResources("0.5", "2Gi"))
.limits(sdkResources("2", "5Gi"))
.build();
}
}

static class Mult2 extends SdkRunnableTask<SdkBindingData<Long>, SdkBindingData<Long>> {
Expand All @@ -117,4 +135,18 @@ public SdkBindingData<Long> run(SdkBindingData<Long> input) {
return SdkBindingDataFactory.of(input.get() * 2);
}
}

private static Map<Resources.ResourceName, String> resources(String cpu, String memory) {
Map<Resources.ResourceName, String> limits = new HashMap<>();
limits.put(Resources.ResourceName.CPU, cpu);
limits.put(Resources.ResourceName.MEMORY, memory);
return limits;
}

private static Map<SdkResources.ResourceName, String> sdkResources(String cpu, String memory) {
Map<SdkResources.ResourceName, String> limits = new HashMap<>();
limits.put(SdkResources.ResourceName.CPU, cpu);
limits.put(SdkResources.ResourceName.MEMORY, memory);
return limits;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ private static TaskTemplate createTaskTemplateForDynamicWorkflow(
"{{.taskTemplatePath}}"))
.image(image)
.env(emptyList())
.resources(task.getResources())
.build();

return TaskTemplate.builder()
Expand Down
Loading