Skip to content

Commit 44e536b

Browse files
committed
Renamed functions to l2_norm [skip ci]
1 parent bc199a3 commit 44e536b

9 files changed

Lines changed: 53 additions & 53 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,10 +895,10 @@ Function | Description | Added
895895
--- | --- | ---
896896
cosine_distance(halfvec, halfvec) → double precision | cosine distance | unreleased
897897
halfvec_dims(halfvec) → integer | number of dimensions | unreleased
898-
halfvec_norm(halfvec) → double precision | Euclidean norm | unreleased
899898
inner_product(halfvec, halfvec) → double precision | inner product | unreleased
900899
l1_distance(halfvec, halfvec) → double precision | taxicab distance | unreleased
901900
l2_distance(halfvec, halfvec) → double precision | Euclidean distance | unreleased
901+
l2_norm(halfvec) → double precision | Euclidean norm | unreleased
902902
quantize_binary(halfvec) → bit | quantize | unreleased
903903
subvector(halfvec, integer, integer) → halfvec | subvector | unreleased
904904

@@ -947,7 +947,7 @@ cosine_distance(sparsevec, sparsevec) → double precision | cosine distance | u
947947
inner_product(sparsevec, sparsevec) → double precision | inner product | unreleased
948948
l1_distance(sparsevec, sparsevec) → double precision | taxicab distance | unreleased
949949
l2_distance(sparsevec, sparsevec) → double precision | Euclidean distance | unreleased
950-
sparsevec_norm(sparsevec) → double precision | Euclidean norm | unreleased
950+
l2_norm(sparsevec) → double precision | Euclidean norm | unreleased
951951

952952
## Installation Notes - Linux and Mac
953953

sql/vector--0.6.2--0.7.0.sql

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ CREATE FUNCTION l1_distance(halfvec, halfvec) RETURNS float8
7474
CREATE FUNCTION halfvec_dims(halfvec) RETURNS integer
7575
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
7676

77-
CREATE FUNCTION halfvec_norm(halfvec) RETURNS float8
78-
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
77+
CREATE FUNCTION l2_norm(halfvec) RETURNS float8
78+
AS 'MODULE_PATHNAME', 'halfvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
7979

8080
CREATE FUNCTION halfvec_add(halfvec, halfvec) RETURNS halfvec
8181
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -277,15 +277,15 @@ CREATE OPERATOR CLASS halfvec_ip_ops
277277
OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
278278
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
279279
FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
280-
FUNCTION 4 halfvec_norm(halfvec);
280+
FUNCTION 4 l2_norm(halfvec);
281281

282282
CREATE OPERATOR CLASS halfvec_cosine_ops
283283
FOR TYPE halfvec USING ivfflat AS
284284
OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
285285
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
286-
FUNCTION 2 halfvec_norm(halfvec),
286+
FUNCTION 2 l2_norm(halfvec),
287287
FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
288-
FUNCTION 4 halfvec_norm(halfvec);
288+
FUNCTION 4 l2_norm(halfvec);
289289

290290
CREATE OPERATOR CLASS halfvec_l2_ops
291291
FOR TYPE halfvec USING hnsw AS
@@ -301,7 +301,7 @@ CREATE OPERATOR CLASS halfvec_cosine_ops
301301
FOR TYPE halfvec USING hnsw AS
302302
OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
303303
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
304-
FUNCTION 2 halfvec_norm(halfvec);
304+
FUNCTION 2 l2_norm(halfvec);
305305

306306
CREATE TYPE sparsevec;
307307

@@ -338,8 +338,8 @@ CREATE FUNCTION inner_product(sparsevec, sparsevec) RETURNS float8
338338
CREATE FUNCTION cosine_distance(sparsevec, sparsevec) RETURNS float8
339339
AS 'MODULE_PATHNAME', 'sparsevec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
340340

341-
CREATE FUNCTION sparsevec_norm(sparsevec) RETURNS float8
342-
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
341+
CREATE FUNCTION l2_norm(sparsevec) RETURNS float8
342+
AS 'MODULE_PATHNAME', 'sparsevec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
343343

344344
CREATE FUNCTION sparsevec_lt(sparsevec, sparsevec) RETURNS bool
345345
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -460,4 +460,4 @@ CREATE OPERATOR CLASS sparsevec_cosine_ops
460460
FOR TYPE sparsevec USING hnsw AS
461461
OPERATOR 1 <=> (sparsevec, sparsevec) FOR ORDER BY float_ops,
462462
FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
463-
FUNCTION 2 sparsevec_norm(sparsevec);
463+
FUNCTION 2 l2_norm(sparsevec);

sql/vector.sql

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ CREATE FUNCTION l1_distance(halfvec, halfvec) RETURNS float8
367367
CREATE FUNCTION halfvec_dims(halfvec) RETURNS integer
368368
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
369369

370-
CREATE FUNCTION halfvec_norm(halfvec) RETURNS float8
371-
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
370+
CREATE FUNCTION l2_norm(halfvec) RETURNS float8
371+
AS 'MODULE_PATHNAME', 'halfvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
372372

373373
CREATE FUNCTION halfvec_add(halfvec, halfvec) RETURNS halfvec
374374
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -582,15 +582,15 @@ CREATE OPERATOR CLASS halfvec_ip_ops
582582
OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
583583
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
584584
FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
585-
FUNCTION 4 halfvec_norm(halfvec);
585+
FUNCTION 4 l2_norm(halfvec);
586586

587587
CREATE OPERATOR CLASS halfvec_cosine_ops
588588
FOR TYPE halfvec USING ivfflat AS
589589
OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
590590
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
591-
FUNCTION 2 halfvec_norm(halfvec),
591+
FUNCTION 2 l2_norm(halfvec),
592592
FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
593-
FUNCTION 4 halfvec_norm(halfvec);
593+
FUNCTION 4 l2_norm(halfvec);
594594

595595
CREATE OPERATOR CLASS halfvec_l2_ops
596596
FOR TYPE halfvec USING hnsw AS
@@ -606,7 +606,7 @@ CREATE OPERATOR CLASS halfvec_cosine_ops
606606
FOR TYPE halfvec USING hnsw AS
607607
OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
608608
FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
609-
FUNCTION 2 halfvec_norm(halfvec);
609+
FUNCTION 2 l2_norm(halfvec);
610610

611611
--- sparsevec type
612612

@@ -647,8 +647,8 @@ CREATE FUNCTION inner_product(sparsevec, sparsevec) RETURNS float8
647647
CREATE FUNCTION cosine_distance(sparsevec, sparsevec) RETURNS float8
648648
AS 'MODULE_PATHNAME', 'sparsevec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
649649

650-
CREATE FUNCTION sparsevec_norm(sparsevec) RETURNS float8
651-
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
650+
CREATE FUNCTION l2_norm(sparsevec) RETURNS float8
651+
AS 'MODULE_PATHNAME', 'sparsevec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
652652

653653
-- sparsevec private functions
654654

@@ -779,4 +779,4 @@ CREATE OPERATOR CLASS sparsevec_cosine_ops
779779
FOR TYPE sparsevec USING hnsw AS
780780
OPERATOR 1 <=> (sparsevec, sparsevec) FOR ORDER BY float_ops,
781781
FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
782-
FUNCTION 2 sparsevec_norm(sparsevec);
782+
FUNCTION 2 l2_norm(sparsevec);

src/halfvec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,9 +727,9 @@ halfvec_dims(PG_FUNCTION_ARGS)
727727
/*
728728
* Get the L2 norm of a half vector
729729
*/
730-
PGDLLEXPORT PG_FUNCTION_INFO_V1(halfvec_norm);
730+
PGDLLEXPORT PG_FUNCTION_INFO_V1(halfvec_l2_norm);
731731
Datum
732-
halfvec_norm(PG_FUNCTION_ARGS)
732+
halfvec_l2_norm(PG_FUNCTION_ARGS)
733733
{
734734
HalfVector *a = PG_GETARG_HALFVEC_P(0);
735735
half *ax = a->x;

src/sparsevec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,9 @@ sparsevec_cosine_distance(PG_FUNCTION_ARGS)
784784
/*
785785
* Get the L2 norm of a sparse vector
786786
*/
787-
PGDLLEXPORT PG_FUNCTION_INFO_V1(sparsevec_norm);
787+
PGDLLEXPORT PG_FUNCTION_INFO_V1(sparsevec_l2_norm);
788788
Datum
789-
sparsevec_norm(PG_FUNCTION_ARGS)
789+
sparsevec_l2_norm(PG_FUNCTION_ARGS)
790790
{
791791
SparseVector *a = PG_GETARG_SPARSEVEC_P(0);
792792
float *ax = SPARSEVEC_VALUES(a);

test/expected/halfvec_functions.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,22 @@ SELECT halfvec_dims('[1,2,3]'::halfvec);
144144
3
145145
(1 row)
146146

147-
SELECT round(halfvec_norm('[1,1]')::numeric, 5);
147+
SELECT round(l2_norm('[1,1]'::halfvec)::numeric, 5);
148148
round
149149
---------
150150
1.41421
151151
(1 row)
152152

153-
SELECT halfvec_norm('[3,4]');
154-
halfvec_norm
155-
--------------
156-
5
153+
SELECT l2_norm('[3,4]'::halfvec);
154+
l2_norm
155+
---------
156+
5
157157
(1 row)
158158

159-
SELECT halfvec_norm('[0,1]');
160-
halfvec_norm
161-
--------------
162-
1
159+
SELECT l2_norm('[0,1]'::halfvec);
160+
l2_norm
161+
---------
162+
1
163163
(1 row)
164164

165165
SELECT l2_distance('[0,0]'::halfvec, '[3,4]');

test/expected/sparsevec_functions.out

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,28 +112,28 @@ SELECT sparsevec_cmp('{1:2,2:3}/2', '{1:1,2:2,3:3}/3');
112112
1
113113
(1 row)
114114

115-
SELECT round(sparsevec_norm('{1:1,2:1}/2')::numeric, 5);
115+
SELECT round(l2_norm('{1:1,2:1}/2'::sparsevec)::numeric, 5);
116116
round
117117
---------
118118
1.41421
119119
(1 row)
120120

121-
SELECT sparsevec_norm('{1:3,2:4}/2');
122-
sparsevec_norm
123-
----------------
124-
5
121+
SELECT l2_norm('{1:3,2:4}/2'::sparsevec);
122+
l2_norm
123+
---------
124+
5
125125
(1 row)
126126

127-
SELECT sparsevec_norm('{2:1}/2');
128-
sparsevec_norm
129-
----------------
130-
1
127+
SELECT l2_norm('{2:1}/2'::sparsevec);
128+
l2_norm
129+
---------
130+
1
131131
(1 row)
132132

133-
SELECT sparsevec_norm('{1:3e37,2:4e37}/2')::real;
134-
sparsevec_norm
135-
----------------
136-
5e+37
133+
SELECT l2_norm('{1:3e37,2:4e37}/2'::sparsevec)::real;
134+
l2_norm
135+
---------
136+
5e+37
137137
(1 row)
138138

139139
SELECT l2_distance('{}/2'::sparsevec, '{1:3,2:4}/2');

test/sql/halfvec_functions.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ SELECT halfvec_cmp('[2,3]', '[1,2,3]');
2929

3030
SELECT halfvec_dims('[1,2,3]'::halfvec);
3131

32-
SELECT round(halfvec_norm('[1,1]')::numeric, 5);
33-
SELECT halfvec_norm('[3,4]');
34-
SELECT halfvec_norm('[0,1]');
32+
SELECT round(l2_norm('[1,1]'::halfvec)::numeric, 5);
33+
SELECT l2_norm('[3,4]'::halfvec);
34+
SELECT l2_norm('[0,1]'::halfvec);
3535

3636
SELECT l2_distance('[0,0]'::halfvec, '[3,4]');
3737
SELECT l2_distance('[0,0]'::halfvec, '[0,1]');

test/sql/sparsevec_functions.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{1:1,2:2}/2');
1919
SELECT sparsevec_cmp('{1:1,2:2}/2', '{1:2,2:3,3:4}/3');
2020
SELECT sparsevec_cmp('{1:2,2:3}/2', '{1:1,2:2,3:3}/3');
2121

22-
SELECT round(sparsevec_norm('{1:1,2:1}/2')::numeric, 5);
23-
SELECT sparsevec_norm('{1:3,2:4}/2');
24-
SELECT sparsevec_norm('{2:1}/2');
25-
SELECT sparsevec_norm('{1:3e37,2:4e37}/2')::real;
22+
SELECT round(l2_norm('{1:1,2:1}/2'::sparsevec)::numeric, 5);
23+
SELECT l2_norm('{1:3,2:4}/2'::sparsevec);
24+
SELECT l2_norm('{2:1}/2'::sparsevec);
25+
SELECT l2_norm('{1:3e37,2:4e37}/2'::sparsevec)::real;
2626

2727
SELECT l2_distance('{}/2'::sparsevec, '{1:3,2:4}/2');
2828
SELECT l2_distance('{}/2'::sparsevec, '{2:1}/2');

0 commit comments

Comments
 (0)