Skip to content

Commit 0d8ca0c

Browse files
sivukhinsivukhin
committed
rename BFLOAT16 to FLOATB16 everywhere
1 parent 7434659 commit 0d8ca0c

7 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎libsql-sqlite3/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
195195
sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
196196
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
197197
update.lo userauth.lo upsert.lo util.lo vacuum.lo \
198-
vector.lo vectorfloat32.lo vectorfloat64.lo vectorfloat1bit.lo vectorfloat8.lo vectorfloat16.lo vectorbfloat16.lo \
198+
vector.lo vectorfloat32.lo vectorfloat64.lo vectorfloat1bit.lo vectorfloat8.lo vectorfloat16.lo vectorfloatb16.lo \
199199
vectorIndex.lo vectordiskann.lo vectorvtab.lo \
200200
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
201201
vdbetrace.lo vdbevtab.lo \
@@ -303,13 +303,13 @@ SRC = \
303303
$(TOP)/src/vacuum.c \
304304
$(TOP)/src/vector.c \
305305
$(TOP)/src/vectorInt.h \
306-
$(TOP)/src/vectorbfloat16.c \
307306
$(TOP)/src/vectorfloat1bit.c \
308307
$(TOP)/src/vectorfloat1bit.c \
309308
$(TOP)/src/vectorfloat16.c \
310309
$(TOP)/src/vectorfloat32.c \
311310
$(TOP)/src/vectorfloat64.c \
312311
$(TOP)/src/vectorfloat8.c \
312+
$(TOP)/src/vectorfloatb16.c \
313313
$(TOP)/src/vectorIndexInt.h \
314314
$(TOP)/src/vectorIndex.c \
315315
$(TOP)/src/vectordiskann.c \
@@ -1149,8 +1149,8 @@ vectorfloat1bit.lo: $(TOP)/src/vectorfloat1bit.c $(HDR)
11491149
vectorfloat16.lo: $(TOP)/src/vectorfloat16.c $(HDR)
11501150
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vectorfloat16.c
11511151

1152-
vectorbfloat16.lo: $(TOP)/src/vectorbfloat16.c $(HDR)
1153-
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vectorbfloat16.c
1152+
vectorfloatb16.lo: $(TOP)/src/vectorfloatb16.c $(HDR)
1153+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vectorfloatb16.c
11541154

11551155
vectorfloat32.lo: $(TOP)/src/vectorfloat32.c $(HDR)
11561156
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vectorfloat32.c

‎libsql-sqlite3/src/vector.c‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ size_t vectorDataSize(VectorType type, VectorDims dims){
4747
return ALIGN(dims, sizeof(float)) + sizeof(float) /* alpha */ + sizeof(float) /* shift */;
4848
case VECTOR_TYPE_FLOAT16:
4949
return dims * sizeof(u16);
50-
case VECTOR_TYPE_BFLOAT16:
50+
case VECTOR_TYPE_FLOATB16:
5151
return dims * sizeof(u16);
5252
default:
5353
assert(0);
@@ -126,8 +126,8 @@ float vectorDistanceCos(const Vector *pVector1, const Vector *pVector2){
126126
return vectorF8DistanceCos(pVector1, pVector2);
127127
case VECTOR_TYPE_FLOAT16:
128128
return vectorF16DistanceCos(pVector1, pVector2);
129-
case VECTOR_TYPE_BFLOAT16:
130-
return vectorBF16DistanceCos(pVector1, pVector2);
129+
case VECTOR_TYPE_FLOATB16:
130+
return vectorFB16DistanceCos(pVector1, pVector2);
131131
default:
132132
assert(0);
133133
}
@@ -145,8 +145,8 @@ float vectorDistanceL2(const Vector *pVector1, const Vector *pVector2){
145145
return vectorF8DistanceL2(pVector1, pVector2);
146146
case VECTOR_TYPE_FLOAT16:
147147
return vectorF16DistanceL2(pVector1, pVector2);
148-
case VECTOR_TYPE_BFLOAT16:
149-
return vectorBF16DistanceL2(pVector1, pVector2);
148+
case VECTOR_TYPE_FLOATB16:
149+
return vectorFB16DistanceL2(pVector1, pVector2);
150150
default:
151151
assert(0);
152152
}
@@ -320,9 +320,9 @@ static int vectorParseMeta(const unsigned char *pBlob, size_t nBlobSize, int *pT
320320
}
321321
*pDims = nBlobSize / sizeof(u16);
322322
*pDataSize = nBlobSize;
323-
}else if( *pType == VECTOR_TYPE_BFLOAT16 ){
323+
}else if( *pType == VECTOR_TYPE_FLOATB16 ){
324324
if( nBlobSize % 2 != 0 ){
325-
*pzErrMsg = sqlite3_mprintf("vector: bfloat16 vector blob length must be divisible by 2 (excluding 'type'-byte): length=%d", nBlobSize);
325+
*pzErrMsg = sqlite3_mprintf("vector: floatb16 vector blob length must be divisible by 2 (excluding 'type'-byte): length=%d", nBlobSize);
326326
return SQLITE_ERROR;
327327
}
328328
*pDims = nBlobSize / sizeof(u16);
@@ -378,8 +378,8 @@ int vectorParseSqliteBlobWithType(
378378
case VECTOR_TYPE_FLOAT16:
379379
vectorF16DeserializeFromBlob(pVector, pBlob, nDataSize);
380380
return 0;
381-
case VECTOR_TYPE_BFLOAT16:
382-
vectorBF16DeserializeFromBlob(pVector, pBlob, nDataSize);
381+
case VECTOR_TYPE_FLOATB16:
382+
vectorFB16DeserializeFromBlob(pVector, pBlob, nDataSize);
383383
return 0;
384384
default:
385385
assert(0);
@@ -485,8 +485,8 @@ void vectorDump(const Vector *pVector){
485485
case VECTOR_TYPE_FLOAT16:
486486
vectorF16Dump(pVector);
487487
break;
488-
case VECTOR_TYPE_BFLOAT16:
489-
vectorBF16Dump(pVector);
488+
case VECTOR_TYPE_FLOATB16:
489+
vectorFB16Dump(pVector);
490490
break;
491491
default:
492492
assert(0);
@@ -513,7 +513,7 @@ static int vectorMetaSize(VectorType type, VectorDims dims){
513513
int nDataSize;
514514
if( type == VECTOR_TYPE_FLOAT32 ){
515515
return 0;
516-
}else if( type == VECTOR_TYPE_FLOAT64 || type == VECTOR_TYPE_FLOAT16 || type == VECTOR_TYPE_BFLOAT16 ){
516+
}else if( type == VECTOR_TYPE_FLOAT64 || type == VECTOR_TYPE_FLOAT16 || type == VECTOR_TYPE_FLOATB16 ){
517517
return 1;
518518
}else if( type == VECTOR_TYPE_FLOAT1BIT ){
519519
nDataSize = vectorDataSize(type, dims);
@@ -532,7 +532,7 @@ static int vectorMetaSize(VectorType type, VectorDims dims){
532532
static void vectorSerializeMeta(const Vector *pVector, size_t nDataSize, unsigned char *pBlob, size_t nBlobSize){
533533
if( pVector->type == VECTOR_TYPE_FLOAT32 ){
534534
// no meta for f32 type as this is "default" vector type
535-
}else if( pVector->type == VECTOR_TYPE_FLOAT64 || pVector->type == VECTOR_TYPE_FLOAT16 || pVector->type == VECTOR_TYPE_BFLOAT16 ){
535+
}else if( pVector->type == VECTOR_TYPE_FLOAT64 || pVector->type == VECTOR_TYPE_FLOAT16 || pVector->type == VECTOR_TYPE_FLOATB16 ){
536536
assert( nDataSize % 2 == 0 );
537537
assert( nBlobSize == nDataSize + 1 );
538538
pBlob[nBlobSize - 1] = pVector->type;
@@ -601,8 +601,8 @@ void vectorSerializeToBlob(const Vector *pVector, unsigned char *pBlob, size_t n
601601
case VECTOR_TYPE_FLOAT16:
602602
vectorF16SerializeToBlob(pVector, pBlob, nBlobSize);
603603
break;
604-
case VECTOR_TYPE_BFLOAT16:
605-
vectorBF16SerializeToBlob(pVector, pBlob, nBlobSize);
604+
case VECTOR_TYPE_FLOATB16:
605+
vectorFB16SerializeToBlob(pVector, pBlob, nBlobSize);
606606
break;
607607
default:
608608
assert(0);
@@ -646,10 +646,10 @@ static void vectorConvertFromF32(const Vector *pFrom, Vector *pTo){
646646
for(i = 0; i < pFrom->dims; i++){
647647
dstF16[i] = vectorF16FromFloat(src[i]);
648648
}
649-
}else if( pTo->type == VECTOR_TYPE_BFLOAT16 ){
649+
}else if( pTo->type == VECTOR_TYPE_FLOATB16 ){
650650
dstF16 = pTo->data;
651651
for(i = 0; i < pFrom->dims; i++){
652-
dstF16[i] = vectorBF16FromFloat(src[i]);
652+
dstF16[i] = vectorFB16FromFloat(src[i]);
653653
}
654654
}else{
655655
assert( 0 );
@@ -689,10 +689,10 @@ static void vectorConvertFromF64(const Vector *pFrom, Vector *pTo){
689689
for(i = 0; i < pFrom->dims; i++){
690690
dstF16[i] = vectorF16FromFloat(src[i]);
691691
}
692-
}else if( pTo->type == VECTOR_TYPE_BFLOAT16 ){
692+
}else if( pTo->type == VECTOR_TYPE_FLOATB16 ){
693693
dstF16 = pTo->data;
694694
for(i = 0; i < pFrom->dims; i++){
695-
dstF16[i] = vectorBF16FromFloat(src[i]);
695+
dstF16[i] = vectorFB16FromFloat(src[i]);
696696
}
697697
}else{
698698
assert( 0 );
@@ -741,9 +741,9 @@ static void vectorConvertFrom1Bit(const Vector *pFrom, Vector *pTo){
741741
dstU16[i] = negative;
742742
}
743743
}
744-
}else if( pTo->type == VECTOR_TYPE_BFLOAT16 ){
745-
u16 positive = vectorBF16FromFloat(+1);
746-
u16 negative = vectorBF16FromFloat(-1);
744+
}else if( pTo->type == VECTOR_TYPE_FLOATB16 ){
745+
u16 positive = vectorFB16FromFloat(+1);
746+
u16 negative = vectorFB16FromFloat(-1);
747747
dstU16 = pTo->data;
748748
for(i = 0; i < pFrom->dims; i++){
749749
if( ((src[i / 8] >> (i & 7)) & 1) == 1 ){
@@ -799,10 +799,10 @@ static void vectorConvertFromF8(const Vector *pFrom, Vector *pTo){
799799
for(i = 0; i < pFrom->dims; i++){
800800
dstF16[i] = vectorF16FromFloat(alpha * src[i] + shift);
801801
}
802-
}else if( pTo->type == VECTOR_TYPE_BFLOAT16 ){
802+
}else if( pTo->type == VECTOR_TYPE_FLOATB16 ){
803803
dstF16 = pTo->data;
804804
for(i = 0; i < pFrom->dims; i++){
805-
dstF16[i] = vectorBF16FromFloat(alpha * src[i] + shift);
805+
dstF16[i] = vectorFB16FromFloat(alpha * src[i] + shift);
806806
}
807807
}else{
808808
assert( 0 );
@@ -833,10 +833,10 @@ static void vectorConvertFromF16(const Vector *pFrom, Vector *pTo){
833833
for(i = 0; i < pFrom->dims; i++){
834834
dstF64[i] = vectorF16ToFloat(src[i]);
835835
}
836-
}else if( pTo->type == VECTOR_TYPE_BFLOAT16 ){
836+
}else if( pTo->type == VECTOR_TYPE_FLOATB16 ){
837837
dstU16 = pTo->data;
838838
for(i = 0; i < pFrom->dims; i++){
839-
dstU16[i] = vectorBF16FromFloat(vectorF16ToFloat(src[i]));
839+
dstU16[i] = vectorFB16FromFloat(vectorF16ToFloat(src[i]));
840840
}
841841
}else if( pTo->type == VECTOR_TYPE_FLOAT1BIT ){
842842
dst1Bit = pTo->data;
@@ -853,7 +853,7 @@ static void vectorConvertFromF16(const Vector *pFrom, Vector *pTo){
853853
}
854854
}
855855

856-
static void vectorConvertFromBF16(const Vector *pFrom, Vector *pTo){
856+
static void vectorConvertFromFB16(const Vector *pFrom, Vector *pTo){
857857
int i;
858858
u16 *src;
859859

@@ -864,31 +864,31 @@ static void vectorConvertFromBF16(const Vector *pFrom, Vector *pTo){
864864

865865
assert( pFrom->dims == pTo->dims );
866866
assert( pFrom->type != pTo->type );
867-
assert( pFrom->type == VECTOR_TYPE_BFLOAT16 );
867+
assert( pFrom->type == VECTOR_TYPE_FLOATB16 );
868868

869869
src = pFrom->data;
870870
if( pTo->type == VECTOR_TYPE_FLOAT32 ){
871871
dstF32 = pTo->data;
872872
for(i = 0; i < pFrom->dims; i++){
873-
dstF32[i] = vectorBF16ToFloat(src[i]);
873+
dstF32[i] = vectorFB16ToFloat(src[i]);
874874
}
875875
}else if( pTo->type == VECTOR_TYPE_FLOAT64 ){
876876
dstF64 = pTo->data;
877877
for(i = 0; i < pFrom->dims; i++){
878-
dstF64[i] = vectorBF16ToFloat(src[i]);
878+
dstF64[i] = vectorFB16ToFloat(src[i]);
879879
}
880880
}else if( pTo->type == VECTOR_TYPE_FLOAT16 ){
881881
dstU16 = pTo->data;
882882
for(i = 0; i < pFrom->dims; i++){
883-
dstU16[i] = vectorF16FromFloat(vectorBF16ToFloat(src[i]));
883+
dstU16[i] = vectorF16FromFloat(vectorFB16ToFloat(src[i]));
884884
}
885885
}else if( pTo->type == VECTOR_TYPE_FLOAT1BIT ){
886886
dst1Bit = pTo->data;
887887
for(i = 0; i < pFrom->dims; i += 8){
888888
dst1Bit[i / 8] = 0;
889889
}
890890
for(i = 0; i < pFrom->dims; i++){
891-
if( vectorBF16ToFloat(src[i]) > 0 ){
891+
if( vectorFB16ToFloat(src[i]) > 0 ){
892892
dst1Bit[i / 8] |= (1 << (i & 7));
893893
}
894894
}
@@ -964,15 +964,15 @@ static void vectorConvertToF8(const Vector *pFrom, Vector *pTo){
964964
for(i = 0; i < pFrom->dims; i++){
965965
dst[i] = clip((vectorF16ToFloat(srcU16[i]) - shift) / alpha, 0, 255);
966966
}
967-
}else if( pFrom->type == VECTOR_TYPE_BFLOAT16 ){
967+
}else if( pFrom->type == VECTOR_TYPE_FLOATB16 ){
968968
srcU16 = pFrom->data;
969969
for(i = 0; i < pFrom->dims; i++){
970-
MINMAX(i, vectorBF16ToFloat(srcU16[i]), minF, maxF);
970+
MINMAX(i, vectorFB16ToFloat(srcU16[i]), minF, maxF);
971971
}
972972
shift = minF;
973973
alpha = (maxF - minF) / 255;
974974
for(i = 0; i < pFrom->dims; i++){
975-
dst[i] = clip((vectorBF16ToFloat(srcU16[i]) - shift) / alpha, 0, 255);
975+
dst[i] = clip((vectorFB16ToFloat(srcU16[i]) - shift) / alpha, 0, 255);
976976
}
977977
}else{
978978
assert( 0 );
@@ -1001,8 +1001,8 @@ void vectorConvert(const Vector *pFrom, Vector *pTo){
10011001
vectorConvertFromF8(pFrom, pTo);
10021002
}else if( pFrom->type == VECTOR_TYPE_FLOAT16 ){
10031003
vectorConvertFromF16(pFrom, pTo);
1004-
}else if( pFrom->type == VECTOR_TYPE_BFLOAT16 ){
1005-
vectorConvertFromBF16(pFrom, pTo);
1004+
}else if( pFrom->type == VECTOR_TYPE_FLOATB16 ){
1005+
vectorConvertFromFB16(pFrom, pTo);
10061006
}else{
10071007
assert( 0 );
10081008
}
@@ -1100,7 +1100,7 @@ static void vectorb16Func(
11001100
int argc,
11011101
sqlite3_value **argv
11021102
){
1103-
vectorFuncHintedType(context, argc, argv, VECTOR_TYPE_BFLOAT16);
1103+
vectorFuncHintedType(context, argc, argv, VECTOR_TYPE_FLOATB16);
11041104
}
11051105

11061106
static void vector1BitFunc(

‎libsql-sqlite3/src/vectorIndex.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ static struct VectorColumnType VECTOR_COLUMN_TYPES[] = {
387387
{ "F8_BLOB", VECTOR_TYPE_FLOAT8 },
388388
{ "FLOAT16", VECTOR_TYPE_FLOAT16 },
389389
{ "F16_BLOB", VECTOR_TYPE_FLOAT16 },
390-
{ "BFLOAT16", VECTOR_TYPE_BFLOAT16 },
391-
{ "BF16_BLOB", VECTOR_TYPE_BFLOAT16 },
390+
{ "FLOATB16", VECTOR_TYPE_FLOATB16 },
391+
{ "FB16_BLOB", VECTOR_TYPE_FLOATB16 },
392392
};
393393

394394
/*
@@ -410,7 +410,7 @@ static struct VectorParamName VECTOR_PARAM_NAMES[] = {
410410
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "float1bit", VECTOR_TYPE_FLOAT1BIT },
411411
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "float8", VECTOR_TYPE_FLOAT8 },
412412
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "float16", VECTOR_TYPE_FLOAT16 },
413-
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "bfloat16", VECTOR_TYPE_BFLOAT16 },
413+
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "floatb16", VECTOR_TYPE_FLOATB16 },
414414
{ "compress_neighbors", VECTOR_COMPRESS_NEIGHBORS_PARAM_ID, 0, "float32", VECTOR_TYPE_FLOAT32 },
415415
{ "alpha", VECTOR_PRUNING_ALPHA_PARAM_ID, 2, 0, 0 },
416416
{ "search_l", VECTOR_SEARCH_L_PARAM_ID, 1, 0, 0 },

‎libsql-sqlite3/src/vectorInt.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef u32 VectorDims;
5454
#define VECTOR_TYPE_FLOAT1BIT 3
5555
#define VECTOR_TYPE_FLOAT8 4
5656
#define VECTOR_TYPE_FLOAT16 5
57-
#define VECTOR_TYPE_BFLOAT16 6
57+
#define VECTOR_TYPE_FLOATB16 6
5858

5959
#define VECTOR_FLAGS_STATIC 1
6060

@@ -83,7 +83,7 @@ void vectorInit(Vector *, VectorType, VectorDims, void *);
8383
void vectorDump (const Vector *v);
8484
void vectorF8Dump (const Vector *v);
8585
void vectorF16Dump (const Vector *v);
86-
void vectorBF16Dump(const Vector *v);
86+
void vectorFB16Dump(const Vector *v);
8787
void vectorF32Dump (const Vector *v);
8888
void vectorF64Dump (const Vector *v);
8989
void vector1BitDump(const Vector *v);
@@ -104,7 +104,7 @@ void vectorF64MarshalToText(sqlite3_context *, const Vector *);
104104
void vectorSerializeToBlob (const Vector *, unsigned char *, size_t);
105105
void vectorF8SerializeToBlob (const Vector *, unsigned char *, size_t);
106106
void vectorF16SerializeToBlob (const Vector *, unsigned char *, size_t);
107-
void vectorBF16SerializeToBlob(const Vector *, unsigned char *, size_t);
107+
void vectorFB16SerializeToBlob(const Vector *, unsigned char *, size_t);
108108
void vectorF32SerializeToBlob (const Vector *, unsigned char *, size_t);
109109
void vectorF64SerializeToBlob (const Vector *, unsigned char *, size_t);
110110
void vector1BitSerializeToBlob(const Vector *, unsigned char *, size_t);
@@ -115,7 +115,7 @@ void vector1BitSerializeToBlob(const Vector *, unsigned char *, size_t);
115115
float vectorDistanceCos (const Vector *, const Vector *);
116116
float vectorF8DistanceCos (const Vector *, const Vector *);
117117
float vectorF16DistanceCos (const Vector *, const Vector *);
118-
float vectorBF16DistanceCos(const Vector *, const Vector *);
118+
float vectorFB16DistanceCos(const Vector *, const Vector *);
119119
float vectorF32DistanceCos (const Vector *, const Vector *);
120120
double vectorF64DistanceCos(const Vector *, const Vector *);
121121

@@ -130,7 +130,7 @@ int vector1BitDistanceHamming(const Vector *, const Vector *);
130130
float vectorDistanceL2 (const Vector *, const Vector *);
131131
float vectorF8DistanceL2 (const Vector *, const Vector *);
132132
float vectorF16DistanceL2 (const Vector *, const Vector *);
133-
float vectorBF16DistanceL2(const Vector *, const Vector *);
133+
float vectorFB16DistanceL2(const Vector *, const Vector *);
134134
float vectorF32DistanceL2 (const Vector *, const Vector *);
135135
double vectorF64DistanceL2(const Vector *, const Vector *);
136136

@@ -148,7 +148,7 @@ int vectorParseSqliteBlobWithType(sqlite3_value *, Vector *, char **);
148148

149149
void vectorF8DeserializeFromBlob (Vector *, const unsigned char *, size_t);
150150
void vectorF16DeserializeFromBlob (Vector *, const unsigned char *, size_t);
151-
void vectorBF16DeserializeFromBlob(Vector *, const unsigned char *, size_t);
151+
void vectorFB16DeserializeFromBlob(Vector *, const unsigned char *, size_t);
152152
void vectorF32DeserializeFromBlob (Vector *, const unsigned char *, size_t);
153153
void vectorF64DeserializeFromBlob (Vector *, const unsigned char *, size_t);
154154
void vector1BitDeserializeFromBlob(Vector *, const unsigned char *, size_t);
@@ -159,8 +159,8 @@ void vectorInitFromBlob(Vector *, const unsigned char *, size_t);
159159
u16 vectorF16FromFloat(float);
160160
float vectorF16ToFloat(u16);
161161

162-
u16 vectorBF16FromFloat(float);
163-
float vectorBF16ToFloat(u16);
162+
u16 vectorFB16FromFloat(float);
163+
float vectorFB16ToFloat(u16);
164164

165165
void vectorConvert(const Vector *, Vector *);
166166

0 commit comments

Comments
 (0)