use GenSpec in dense_tensor_peek_function_test
#include <vespa/eval/eval/fast_value.h>
#include <vespa/eval/eval/tensor_function.h>
#include <vespa/eval/eval/test/eval_fixture.h>
-#include <vespa/eval/eval/test/tensor_model.hpp>
+#include <vespa/eval/eval/test/gen_spec.h>
#include <vespa/eval/instruction/dense_tensor_peek_function.h>
#include <vespa/vespalib/testkit/test_kit.h>
#include <vespa/vespalib/util/stash.h>
@@ -18,15 +18,15 @@ const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
EvalFixture::ParamRepo make_params() {
return EvalFixture::ParamRepo()
- .add("a", spec(1.0))
- .add("b", spec(2.0))
- .add("c", spec(3.0))
- .add("x3", spec(x(3), N()))
- .add("x3f", spec(float_cells({x(3)}), N()))
- .add("x3y2", spec({x(3),y(2)}, N()))
- .add("x3y2f", spec(float_cells({x(3),y(2)}), N()))
- .add("xm", spec(x({"1","2","3","-1","-2","-3"}), N()))
- .add("xmy2", spec({x({"1","2","3"}), y(2)}, N()));
+ .add("a", GenSpec().seq_bias(1.0).gen())
+ .add("b", GenSpec().seq_bias(2.0).gen())
+ .add("c", GenSpec().seq_bias(3.0).gen())
+ .add("x3", GenSpec().idx("x", 3).gen())
+ .add("x3f", GenSpec().cells_float().idx("x", 3).gen())
+ .add("x3y2", GenSpec().idx("x", 3).idx("y", 2).gen())
+ .add("x3y2f", GenSpec().cells_float().idx("x", 3).idx("y", 2).gen())
+ .add("xm", GenSpec().map("x", {"1","2","3","-1","-2","-3"}).gen())
+ .add("xmy2", GenSpec().map("x", {"1","2","3"}).idx("y", 2).gen());
}
EvalFixture::ParamRepo param_repo = make_params();
