Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local execution e2e training #1472

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6adb290
temporary weight adjust index
reyna-abhyankar Aug 25, 2024
61697c2
Loss function
reyna-abhyankar Aug 27, 2024
b56c046
Add cuda test for loss function
reyna-abhyankar Aug 27, 2024
f75a3d4
Format
reyna-abhyankar Aug 27, 2024
f74711f
Refactor and build optimizer kernels, op
reyna-abhyankar Aug 27, 2024
40c6252
Finish optimizer local backing
reyna-abhyankar Aug 27, 2024
ad9b9ea
Format
reyna-abhyankar Aug 27, 2024
1ddfade
E2E update test
reyna-abhyankar Aug 27, 2024
dde9496
Format
reyna-abhyankar Aug 27, 2024
59635d8
Small fixes
reyna-abhyankar Sep 11, 2024
103ef07
Format
reyna-abhyankar Sep 11, 2024
f48f9ff
Fix test and small issues
reyna-abhyankar Sep 18, 2024
189c9c8
Format
reyna-abhyankar Sep 18, 2024
d93f464
Merge branch 'repo-refactor' into local-e2e-training
reyna-abhyankar Oct 1, 2024
b5647c8
Pass tests after merge
reyna-abhyankar Oct 1, 2024
f5ff91e
Fix input/weight differentiation
reyna-abhyankar Oct 1, 2024
7470e71
Fix signature to use unified rep
reyna-abhyankar Oct 1, 2024
deece1b
Fix model training instance abstraction
reyna-abhyankar Oct 1, 2024
1d3cc94
Change subcase test name
reyna-abhyankar Oct 1, 2024
3cf5d08
Quick fixes
reyna-abhyankar Oct 16, 2024
79ef4c9
Refactor training backing and instance
reyna-abhyankar Oct 22, 2024
a73b1c3
Expose op folders publicly
reyna-abhyankar Nov 13, 2024
c6fed29
Add tensor type, operate over reduced tensor
reyna-abhyankar Nov 13, 2024
0cdfb1a
Fixes
reyna-abhyankar Jan 7, 2025
9d252b3
Remove tensor lower
reyna-abhyankar Jan 15, 2025
895c117
Add tensor and task lowering scheme
reyna-abhyankar Jan 17, 2025
411017d
Build local exec
reyna-abhyankar Jan 22, 2025
0128abb
Disaggregate local backend
reyna-abhyankar Feb 1, 2025
277f8c2
Update task binding interface and cost estimator
reyna-abhyankar Feb 1, 2025
377c6aa
Merge master into local execution
reyna-abhyankar Feb 4, 2025
8efaec7
Build
reyna-abhyankar Feb 6, 2025
1dc1398
Format
reyna-abhyankar Feb 6, 2025
17ad5c8
Split task spec files
reyna-abhyankar Feb 6, 2025
639c2c1
Delete outdated sim environment file
reyna-abhyankar Feb 6, 2025
a697044
Finish API
reyna-abhyankar Feb 13, 2025
187a8d5
Add tests for allocated and unallocated
reyna-abhyankar Feb 13, 2025
a0f8113
Fix nonnegative
reyna-abhyankar Feb 13, 2025
b1eab94
Format
reyna-abhyankar Feb 13, 2025
b532c50
Pass allocated-unallocated tests
reyna-abhyankar Feb 13, 2025
f28e5c2
Update task registry tests
reyna-abhyankar Feb 13, 2025
89752fa
Move local tensor backing to dtgen
reyna-abhyankar Feb 22, 2025
aef8ad5
Remove lowered tensor source
reyna-abhyankar Feb 22, 2025
f0a4285
Loss and update tests
reyna-abhyankar Feb 24, 2025
9047edc
Merge master
reyna-abhyankar Feb 24, 2025
350babf
Passing tests after merge issues
reyna-abhyankar Feb 24, 2025
aef7c6e
Pass gpu tests
reyna-abhyankar Feb 25, 2025
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
Prev Previous commit
Next Next commit
Add tensor and task lowering scheme
  • Loading branch information
reyna-abhyankar committed Jan 17, 2025
commit 895c117100a0ac4cdb1cc1dead37f2efbe3786f9

This file was deleted.

37 changes: 37 additions & 0 deletions lib/local-execution/include/local-execution/local_args_backing.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#ifndef _FLEXFLOW_LOCAL_EXECUTION_LOCAL_ARGS_BACKING_H
#define _FLEXFLOW_LOCAL_EXECUTION_LOCAL_ARGS_BACKING_H

#include "pcg/layer_guid_t.dtg.h"
#include "pcg/computation_graph.h"
#include "local-execution/per_device_op_state.h"
#include "local-execution/op_task_invocation.h"
#include "local-execution/runtime_arg_config.h"
#include "local-execution/task_invocation.dtg.h"
#include "local-execution/local_task_argument_accessor.h"

namespace FlexFlow {

struct LocalArgsBacking {
LocalArgsBacking(RuntimeArgConfig const &);

public:
void add_per_device_op_state(layer_guid_t const &,
DeviceSpecificDeviceStates const &);

ArgSlotsBacking construct_arg_slots_backing(TaskBinding const &) const;

ConcreteArgSpec lower_to_concrete_arg_spec(RuntimeArgRefSpec const &) const;
ConcreteArgSpec lower_to_concrete_arg_spec(OpArgRefSpec const &,
ComputationGraph const &,
layer_guid_t const &) const;

public:
// arguments
std::unordered_map<layer_guid_t, DeviceSpecificDeviceStates>
per_device_op_states;
RuntimeArgConfig runtime_arg_config;
};

}

#endif
89 changes: 0 additions & 89 deletions lib/local-execution/include/local-execution/local_slots_backing.h

This file was deleted.

58 changes: 58 additions & 0 deletions lib/local-execution/include/local-execution/local_tensor_backing.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@

#ifndef _FLEXFLOW_LOCAL_EXECUTION_LOCAL_TENSOR_BACKING_H
#define _FLEXFLOW_LOCAL_EXECUTION_LOCAL_TENSOR_BACKING_H

#include "kernels/accessor.h"
#include "local-execution/local_task_argument_accessor.h"
#include "local-execution/task_invocation.dtg.h"
#include "local-execution/tensor_role.dtg.h"
#include "local-execution/lowered_tensor_t.dtg.h"
#include "local-execution/lowered_tensor_source.h"
#include "local-execution/optimizer_tensor_t.dtg.h"
#include "local-execution/loss_tensor_t.dtg.h"
#include "pcg/computation_graph.dtg.h"
#include "pcg/tensor_guid_t.dtg.h"
#include "pcg/layer_guid_t.dtg.h"

namespace FlexFlow {

using TensorBackingMap =
std::unordered_map<lowered_tensor_t, GenericTensorAccessorW>;

struct LocalTensorBacking {
LocalTensorBacking();

public:
void allocate_layer_tensors(layer_guid_t const &,
ComputationGraph const &,
Allocator &);
void allocate_tensors_by_role(TensorRole const &,
layer_guid_t const &,
ComputationGraph const &,
Allocator &);
void allocate_optimizer_tensors(tensor_guid_t const &,
std::vector<optimizer_tensor_t> const &,
Allocator &);
TensorSlotsBacking
construct_tensor_slots_backing(TaskBinding const &) const;

GenericTensorAccessorW const &
get_tensor_backing(lowered_tensor_t const &) const;

bool is_tensor_allocated(lowered_tensor_t const &) const;

public:
// tensors
TensorBackingMap tensor_backings;

std::unordered_map<tensor_guid_t, lowered_tensor_t> tensor_lowering_mapping;
std::unordered_map<tensor_guid_t, lowered_tensor_t> gradient_tensor_lowering_mapping;
std::unordered_map<optimizer_tensor_t, lowered_tensor_t> optimizer_tensor_lowering_mapping;
std::unordered_map<loss_tensor_t, lowered_tensor_t> loss_tensor_lowering_mapping;

LoweredTensorSource lowered_tensor_source;
};

} // namespace FlexFlow

#endif
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#ifndef _FLEXFLOW_LOCAL_EXECUTION_LOCAL_TRAINING_BACKING_H
#define _FLEXFLOW_LOCAL_EXECUTION_LOCAL_TRAINING_BACKING_H

#include "local-execution/local_slots_backing.h"
#include "local-execution/local_tensor_backing.h"
#include "local-execution/local_args_backing.h"
#include "local-execution/task_registry.h"
#include "op-attrs/ops/loss_functions/loss_attrs.dtg.h"
#include "pcg/computation_graph.dtg.h"
#include "pcg/optimizer_attrs.dtg.h"
#include "local-execution/optimizer_tensor_source.h"

namespace FlexFlow {

Expand All @@ -15,8 +17,6 @@ using PerLayerElapsedTime =
struct LocalTrainingBacking {
LocalTrainingBacking(Allocator const &,
ComputationGraph const &,
LayerTensorBackingMap const &allocated_forward_tensors,
TensorBackingMap const &allocated_non_graph_tensors,
RuntimeArgConfig const &);
void register_and_allocate_layer(layer_guid_t const &);
void allocate_layer_optimizer_tensors(layer_guid_t const &,
Expand All @@ -25,17 +25,18 @@ struct LocalTrainingBacking {
void execute_init(layer_guid_t const &);
std::optional<float> execute_forward(layer_guid_t const &);
void compute_loss(LossAttrs const &loss_attrs,
reduced_tensor_t const &logit_tensor,
reduced_tensor_t const &label_tensor);
tensor_guid_t const &logit_tensor,
loss_tensor_t const &label_tensor);
std::optional<float> execute_backward(layer_guid_t const &);
void execute_update(layer_guid_t const &, OptimizerAttrs const &);

TaskArgumentAccessor
get_task_arg_accessor(TaskInvocation const &,
std::optional<layer_guid_t> const &) const;
TaskArgumentAccessor get_op_task_arg_accessor(OpTaskInvocation const &,
layer_guid_t const &) const;
LocalSlotsBacking local_slots_backing;
get_task_arg_accessor(TaskInvocation const &) const;

TaskInvocation lower_to_task_invocation(OpTaskInvocation const &, layer_guid_t const &) const;

LocalTensorBacking local_tensor_backing;
LocalArgsBacking local_args_backing;

private:
DeviceSpecificDeviceStates call_init_task_impl(task_id_t,
Expand All @@ -46,6 +47,10 @@ struct LocalTrainingBacking {
Allocator allocator;
ComputationGraph computation_graph;
TaskRegistry task_registry;

// optimizer
OptimizerTensorSource optimizer_tensor_source;
std::unordered_map<layer_guid_t, std::vector<optimizer_tensor_t>> layer_optimizer_tensor_ids;
};

} // namespace FlexFlow
Expand Down
4 changes: 3 additions & 1 deletion lib/local-execution/include/local-execution/loss_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
#include "local-execution/task_invocation.dtg.h"
#include "local-execution/task_signature.h"
#include "op-attrs/ops/loss_functions.h"
#include "pcg/tensor_guid_t.dtg.h"
#include "local-execution/loss_tensor_t.dtg.h"

namespace FlexFlow {

TaskImplFunction get_loss_bwd_task_impl();
TaskSignature get_loss_bwd_signature();
TaskInvocation
backward(LossAttrs const &, reduced_tensor_t logit, reduced_tensor_t label);
backward(LossAttrs const &, tensor_guid_t logit, loss_tensor_t label);

} // namespace FlexFlow

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
namespace = "FlexFlow"
name = "reduced_tensor_t"
name = "loss_tensor_t"
features = [
"eq",
"ord",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#ifndef _FLEXFLOW_LOCAL_EXECUTION_LOWERED_TENSOR_SOURCE_H
#define _FLEXFLOW_LOCAL_EXECUTION_LOWERED_TENSOR_SOURCE_H

#include "local-execution/lowered_tensor_t.dtg.h"

namespace FlexFlow {

struct LoweredTensorSource {
public:
LoweredTensorSource();

lowered_tensor_t new_lowered_tensor();

private:
static size_t next_available_lowered_tensor_id;
};

} // namespace FlexFlow


#endif
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
namespace = "FlexFlow"
name = "non_graph_tensor_guid_t"
name = "lowered_tensor_t"
features = [
"eq",
"ord",
"hash",
"fmt",
"json",
]


[[fields]]
name = "raw_uid"
name = "raw_index"
type = "int"
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include "local-execution/local_training_backing.h"
#include "op-attrs/ops/loss_functions/loss_attrs.dtg.h"
#include "pcg/tensor_guid_t.dtg.h"
#include "local-execution/loss_tensor_t.dtg.h"

namespace FlexFlow {

Expand All @@ -12,12 +14,10 @@ using PerLayerElapsedTime =
struct ModelTrainingInstance {
ModelTrainingInstance(Allocator const &,
ComputationGraph const &,
LayerTensorBackingMap const &allocated_forward_tensors,
TensorBackingMap const &allocated_non_graph_tensors,
RuntimeArgConfig const &,
LossAttrs const &,
reduced_tensor_t const &logit_tensor,
reduced_tensor_t const &label_tensor,
tensor_guid_t const &logit_tensor,
loss_tensor_t const &label_tensor,
OptimizerAttrs const &);

void execute_init();
Expand All @@ -28,8 +28,8 @@ struct ModelTrainingInstance {
ComputationGraph computation_graph;
LocalTrainingBacking training_backing;
LossAttrs loss_attrs;
reduced_tensor_t logit_tensor;
reduced_tensor_t label_tensor;
tensor_guid_t logit_tensor;
loss_tensor_t label_tensor;
OptimizerAttrs optimizer_attrs;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "local-execution/op_tensor_spec.h"
#include "local-execution/profiling.h"
#include "local-execution/runtime_arg_ref.h"
#include "local-execution/slot_tensor_type_id.dtg.h"
#include "local-execution/slot_grad_id.dtg.h"
#include "local-execution/task_id_t.dtg.h"
#include "local-execution/variadic_tensor_ref.h"
#include <typeindex>
Expand Down Expand Up @@ -84,14 +84,14 @@ struct OpTaskBinding {
bool operator==(OpTaskBinding const &other) const;
bool operator!=(OpTaskBinding const &other) const;

std::unordered_map<SlotTensorTypeId, OpTensorSpec> const &
std::unordered_map<SlotGradId, OpTensorSpec> const &
get_tensor_bindings() const;
std::unordered_map<slot_id_t, OpArgSpec> const &get_arg_bindings() const;

void bind_from_forward(OpTaskBinding const &fwd);

private:
std::unordered_map<SlotTensorTypeId, OpTensorSpec> tensor_bindings;
std::unordered_map<SlotGradId, OpTensorSpec> tensor_bindings;
std::unordered_map<slot_id_t, OpArgSpec> arg_bindings;

private:
Expand Down
Loading