@@ -44,13 +44,20 @@ create_strings(
4444flatbuffers::Offset<fbs::TensorMeta> create_tensor_meta (
4545 flatbuffers::FlatBufferBuilder& builder,
4646 fbs::ScalarType dtype,
47- const std::vector<int64_t >& shape) {
47+ const std::vector<int64_t >& shape,
48+ const std::vector<int64_t >& lower_bounds = {},
49+ const std::vector<int32_t >& dim_order = {}) {
4850 std::vector<flatbuffers::Offset<fbs::Dim>> sizes;
4951 sizes.reserve (shape.size ());
50- for (const int64_t size : shape) {
51- sizes.push_back (fbs::CreateDim (builder, size, size));
52+ for (size_t i = 0 ; i < shape.size (); ++i) {
53+ const int64_t lower = lower_bounds.empty () ? shape[i] : lower_bounds.at (i);
54+ sizes.push_back (fbs::CreateDim (builder, lower, shape[i]));
5255 }
53- return fbs::CreateTensorMeta (builder, dtype, builder.CreateVector (sizes));
56+ return fbs::CreateTensorMeta (
57+ builder,
58+ dtype,
59+ builder.CreateVector (sizes),
60+ builder.CreateVector (dim_order));
5461}
5562
5663flatbuffers::Offset<fbs::TensorMeta> create_tensor_meta (
@@ -121,9 +128,11 @@ std::vector<uint8_t> finish_program(
121128
122129std::vector<uint8_t > make_add_program (
123130 fbs::ScalarType dtype,
131+ const std::vector<int64_t >& shape = {4 },
132+ const std::vector<int64_t >& lower_bounds = {},
124133 bool include_mutation_output = false ) {
125134 flatbuffers::FlatBufferBuilder builder;
126- const auto meta = create_tensor_meta (builder, dtype);
135+ const auto meta = create_tensor_meta (builder, dtype, shape, lower_bounds );
127136 const std::vector<flatbuffers::Offset<fbs::TensorValue>> tensor_values = {
128137 fbs::CreateTensorValueDirect (builder, " left" , meta),
129138 fbs::CreateTensorValueDirect (builder, " right" , meta),
@@ -601,6 +610,52 @@ std::vector<uint8_t> make_mean_view_mm_program() {
601610 builder, graph, {fbs::CreateOutputSpecDirect (builder, " product" )});
602611}
603612
613+ std::vector<uint8_t > make_relu_program (const std::vector<int32_t >& dim_order) {
614+ flatbuffers::FlatBufferBuilder builder;
615+ const auto meta = create_tensor_meta (
616+ builder, fbs::ScalarType::FLOAT , {2 , 2 }, /* lower_bounds=*/ {}, dim_order);
617+ const std::vector<flatbuffers::Offset<fbs::TensorValue>> tensor_values = {
618+ fbs::CreateTensorValueDirect (builder, " input" , meta),
619+ fbs::CreateTensorValueDirect (builder, " relu" , meta),
620+ };
621+ const std::vector<flatbuffers::Offset<fbs::Output>> input_outputs = {
622+ fbs::CreateOutputDirect (builder, " input" )};
623+ const std::vector<flatbuffers::Offset<fbs::Output>> relu_outputs = {
624+ fbs::CreateOutputDirect (builder, " relu" )};
625+ const std::vector<flatbuffers::Offset<fbs::NamedArgument>> relu_inputs = {
626+ fbs::CreateNamedArgumentDirect (
627+ builder, " self" , create_tensor_arg (builder, " input" ))};
628+ const std::vector<flatbuffers::Offset<fbs::NamedArgument>> output_inputs = {
629+ fbs::CreateNamedArgumentDirect (
630+ builder, " " , create_tensor_arg (builder, " relu" ))};
631+ const std::vector<flatbuffers::Offset<fbs::Node>> nodes = {
632+ fbs::CreateNodeDirect (
633+ builder,
634+ " input" ,
635+ fbs::OpKind::PLACEHOLDER ,
636+ " " ,
637+ nullptr ,
638+ &input_outputs),
639+ fbs::CreateNodeDirect (
640+ builder,
641+ " relu" ,
642+ fbs::OpKind::CALL_FUNCTION ,
643+ " torch.ops.aten.relu.default" ,
644+ &relu_inputs,
645+ &relu_outputs),
646+ fbs::CreateNodeDirect (
647+ builder, " output" , fbs::OpKind::OUTPUT , " " , &output_inputs),
648+ };
649+ const auto graph = fbs::CreateGraph (
650+ builder,
651+ builder.CreateVector (nodes),
652+ create_strings (builder, {" input" }),
653+ create_strings (builder, {" relu" }),
654+ builder.CreateVector (tensor_values));
655+ return finish_program (
656+ builder, graph, {fbs::CreateOutputSpecDirect (builder, " relu" )});
657+ }
658+
604659struct CompiledProgram {
605660 std::unique_ptr<VulkanEngineHost> host;
606661 std::shared_ptr<const Program> program;
@@ -683,7 +738,7 @@ TEST(VulkanEngineTest, ExposesOnlyUserOutputsWhenMutationOutputsArePresent) {
683738
684739TEST (VulkanEngineTest, RejectsUserInputMutation) {
685740 try {
686- compile_program (make_add_program (fbs::ScalarType::FLOAT , true ));
741+ compile_program (make_add_program (fbs::ScalarType::FLOAT , { 4 }, {}, true ));
687742 FAIL () << " expected the user input mutation to be rejected" ;
688743 } catch (const std::runtime_error& e) {
689744 EXPECT_NE (
@@ -693,6 +748,36 @@ TEST(VulkanEngineTest, RejectsUserInputMutation) {
693748 }
694749}
695750
751+ TEST (VulkanEngineTest, ResizesInputsWithinSerializedBounds) {
752+ CompiledProgram compiled =
753+ compile_program (make_add_program (fbs::ScalarType::FLOAT , {4 }, {1 }));
754+
755+ EXPECT_THROW (compiled.executable ->resize_input (0 , {0 }), std::runtime_error);
756+ EXPECT_THROW (compiled.executable ->resize_input (0 , {5 }), std::runtime_error);
757+ compiled.executable ->resize_input (0 , {2 });
758+ compiled.executable ->resize_input (1 , {2 });
759+ EXPECT_EQ (compiled.executable ->input_sizes (0 ), (std::vector<int64_t >{2 }));
760+
761+ const std::vector<float > left = {1 .0f , 2 .0f };
762+ const std::vector<float > right = {10 .0f , 20 .0f };
763+ compiled.executable ->set_input (
764+ 0 , left.data (), left.size (), ScalarType::Float);
765+ compiled.executable ->set_input (
766+ 1 , right.data (), right.size (), ScalarType::Float);
767+ compiled.executable ->execute ();
768+
769+ EXPECT_EQ (compiled.executable ->output_sizes (0 ), (std::vector<int64_t >{2 }));
770+ std::vector<float > output (2 );
771+ compiled.executable ->get_output (
772+ 0 , output.data (), output.size (), ScalarType::Float);
773+ EXPECT_EQ (output, (std::vector<float >{11 .0f , 22 .0f }));
774+ }
775+
776+ TEST (VulkanEngineTest, RejectsNonContiguousGraphInputsAndOutputs) {
777+ EXPECT_NO_THROW (compile_program (make_relu_program ({0 , 1 })));
778+ EXPECT_THROW (compile_program (make_relu_program ({1 , 0 })), std::runtime_error);
779+ }
780+
696781TEST (VulkanEngineTest, PreservesLogicalLongDtypeAndChecksNarrowing) {
697782 CompiledProgram compiled =
698783 compile_program (make_add_program (fbs::ScalarType::LONG ));
0 commit comments