Skip to content

Commit 34ebaf5

Browse files
wvabrinskaswvabrinskas
authored
Merge pull request #8 from wvabrinskas/develop
updated to support Float16 on macOS universal
2 parents 5aaa119 + ed36949 commit 34ebaf5

File tree

6 files changed

+111
-96
lines changed

6 files changed

+111
-96
lines changed

‎Sources/NumSwift/Float16.swift

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import Foundation
99
import Accelerate
1010

11+
#if arch(arm64)
1112
public extension Array where Element == [Float16] {
1213
var shape: [Int] {
1314
let rows = self.count
@@ -867,3 +868,4 @@ public extension Array where Element == [Float16] {
867868
return result
868869
}
869870
}
871+
#endif

‎Sources/NumSwift/NumSwift.swift

+68-59
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,7 @@ public class NumSwift {
5959
}
6060
}
6161
}
62-
63-
public static func randomChoice<T: Equatable>(in array: [T], p: [Float16] = []) -> (T, Int) {
64-
guard p.isEmpty == false, p.count == array.count else {
65-
let index = Int.random(in: 0..<array.count)
66-
return (array[index], index)
67-
}
68-
69-
var distributionArray: [T] = []
70-
71-
for i in 0..<p.count {
72-
let prob = Int(ceil(p[i] * 100))
73-
let a = array[i]
74-
75-
distributionArray.append(contentsOf: [T](repeating: a, count: prob))
76-
}
77-
78-
guard distributionArray.isEmpty == false else {
79-
let index = Int.random(in: 0..<array.count)
80-
return (array[index], index)
81-
}
82-
83-
let random = Int.random(in: 0..<distributionArray.count)
84-
let arrayIndex = array.firstIndex(where: { distributionArray[random] == $0 })
85-
return (distributionArray[random], arrayIndex ?? 0)
86-
}
87-
88-
62+
8963
public static func randomChoice<T: Equatable>(in array: [T], p: [Float] = []) -> (T, Int) {
9064
guard p.isEmpty == false, p.count == array.count else {
9165
let index = Int.random(in: 0..<array.count)
@@ -124,21 +98,7 @@ public class NumSwift {
12498

12599
return result
126100
}
127-
128-
public static func onesLike(_ size: (rows: Int, columns: Int, depth: Int)) -> [[[Float16]]] {
129-
var result: [[[Float16]]] = []
130-
131-
for _ in 0..<size.depth {
132-
var row: [[Float16]] = []
133-
for _ in 0..<size.rows {
134-
row.append([Float16](repeating: 1.0, count: size.columns))
135-
}
136-
result.append(row)
137-
}
138101

139-
return result
140-
}
141-
142102
public static func onesLike(_ size: (rows: Int, columns: Int)) -> [[Double]] {
143103
Array((0..<size.rows).map { _ in [Double](repeating: 1.0, count: size.columns) })
144104
}
@@ -161,20 +121,6 @@ public class NumSwift {
161121
return result
162122
}
163123

164-
public static func zerosLike(_ size: (rows: Int, columns: Int, depth: Int)) -> [[[Float16]]] {
165-
var result: [[[Float16]]] = []
166-
167-
for _ in 0..<size.depth {
168-
var row: [[Float16]] = []
169-
for _ in 0..<size.rows {
170-
row.append([Float16](repeating: 0, count: size.columns))
171-
}
172-
result.append(row)
173-
}
174-
175-
return result
176-
}
177-
178124
public static func zerosLike(_ size: (rows: Int, columns: Int, depth: Int)) -> [[[Float]]] {
179125
var result: [[[Float]]] = []
180126

@@ -197,10 +143,6 @@ public class NumSwift {
197143
Array((0..<size.rows).map { _ in [Float](repeating: 0.0, count: size.columns) })
198144
}
199145

200-
public static func zerosLike(_ size: (rows: Int, columns: Int)) -> [[Float16]] {
201-
Array((0..<size.rows).map { _ in [Float16](repeating: 0.0, count: size.columns) })
202-
}
203-
204146
public static func zerosLike<T: Collection>(_ array: T) -> Array<AnyHashable> {
205147
let shape = array.shapeOf
206148

@@ -532,3 +474,70 @@ public extension NumSwift {
532474

533475
}
534476

477+
478+
479+
#if arch(arm64)
480+
// MARK: Float16
481+
extension NumSwift {
482+
483+
public static func zerosLike(_ size: (rows: Int, columns: Int, depth: Int)) -> [[[Float16]]] {
484+
var result: [[[Float16]]] = []
485+
486+
for _ in 0..<size.depth {
487+
var row: [[Float16]] = []
488+
for _ in 0..<size.rows {
489+
row.append([Float16](repeating: 0, count: size.columns))
490+
}
491+
result.append(row)
492+
}
493+
494+
return result
495+
}
496+
497+
public static func onesLike(_ size: (rows: Int, columns: Int, depth: Int)) -> [[[Float16]]] {
498+
var result: [[[Float16]]] = []
499+
500+
for _ in 0..<size.depth {
501+
var row: [[Float16]] = []
502+
for _ in 0..<size.rows {
503+
row.append([Float16](repeating: 1.0, count: size.columns))
504+
}
505+
result.append(row)
506+
}
507+
508+
return result
509+
}
510+
511+
512+
public static func randomChoice<T: Equatable>(in array: [T], p: [Float16] = []) -> (T, Int) {
513+
guard p.isEmpty == false, p.count == array.count else {
514+
let index = Int.random(in: 0..<array.count)
515+
return (array[index], index)
516+
}
517+
518+
var distributionArray: [T] = []
519+
520+
for i in 0..<p.count {
521+
let prob = Int(ceil(p[i] * 100))
522+
let a = array[i]
523+
524+
distributionArray.append(contentsOf: [T](repeating: a, count: prob))
525+
}
526+
527+
guard distributionArray.isEmpty == false else {
528+
let index = Int.random(in: 0..<array.count)
529+
return (array[index], index)
530+
}
531+
532+
let random = Int.random(in: 0..<distributionArray.count)
533+
let arrayIndex = array.firstIndex(where: { distributionArray[random] == $0 })
534+
return (distributionArray[random], arrayIndex ?? 0)
535+
}
536+
537+
538+
public static func zerosLike(_ size: (rows: Int, columns: Int)) -> [[Float16]] {
539+
Array((0..<size.rows).map { _ in [Float16](repeating: 0.0, count: size.columns) })
540+
}
541+
}
542+
543+
#endif

‎Sources/NumSwift/NumSwiftC/Base/NumSwiftCF16Base.swift

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public protocol FloatArithmeticBase {
3333
static func div(lhs: Scalar, rhs: [Scalar]) -> [Scalar]
3434
}
3535

36+
#if arch(arm64)
3637
public struct Float16Arithmetic: FloatArithmeticBase {
3738
public static func sum(_ array: [Float16]) -> Float16 {
3839
nsc_sum(array)
@@ -119,3 +120,4 @@ public struct Float16Arithmetic: FloatArithmeticBase {
119120
}
120121
}
121122

123+
#endif

‎Sources/NumSwift/NumSwiftC/NumSwiftC_Float16.swift

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import Foundation
99
import NumSwiftC
1010

11+
#if arch(arm64)
1112
public extension NumSwiftC {
1213

1314
public static func tranpose(_ a: [[Float16]], size: (rows: Int, columns: Int)) -> [[Float16]] {
@@ -393,3 +394,4 @@ public extension NumSwiftC {
393394
return results
394395
}
395396
}
397+
#endif

‎Sources/NumSwiftC/include/numswiftc_base.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,34 @@
2727
*/
2828

2929
typedef struct {
30-
__fp16 value;
30+
_Float16 value;
3131
int index;
3232
} NSC_IndexedValue;
3333

34-
extern NSC_IndexedValue nsc_index_of_min(const __fp16 array[]);
35-
extern NSC_IndexedValue nsc_index_of_max(const __fp16 array[]);
36-
extern __fp16 nsc_max(const __fp16 array[]);
37-
extern __fp16 nsc_min(const __fp16 array[]);
38-
extern __fp16 nsc_mean(const __fp16 array[]);
39-
extern __fp16 nsc_sum(const __fp16 array[]);
40-
extern __fp16 nsc_sum_of_squares(const __fp16 array[]);
34+
extern NSC_IndexedValue nsc_index_of_min(const _Float16 array[]);
35+
extern NSC_IndexedValue nsc_index_of_max(const _Float16 array[]);
36+
extern _Float16 nsc_max(const _Float16 array[]);
37+
extern _Float16 nsc_min(const _Float16 array[]);
38+
extern _Float16 nsc_mean(const _Float16 array[]);
39+
extern _Float16 nsc_sum(const _Float16 array[]);
40+
extern _Float16 nsc_sum_of_squares(const _Float16 array[]);
4141

42-
extern void nsc_add_scalar(const __fp16 lhs, const __fp16 rhs[], __fp16 *result);
43-
extern void nsc_add(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result);
42+
extern void nsc_add_scalar(const _Float16 lhs, const _Float16 rhs[], _Float16 *result);
43+
extern void nsc_add(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result);
4444

4545

46-
extern void nsc_sub(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result);
46+
extern void nsc_sub(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result);
4747

4848

49-
extern void nsc_mult_scalar(const __fp16 lhs, const __fp16 rhs[], __fp16 *result);
50-
extern void nsc_mult(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result);
49+
extern void nsc_mult_scalar(const _Float16 lhs, const _Float16 rhs[], _Float16 *result);
50+
extern void nsc_mult(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result);
5151

5252

53-
extern void nsc_div_scalar_array(const __fp16 lhs, const __fp16 rhs[], __fp16 *result);
53+
extern void nsc_div_scalar_array(const _Float16 lhs, const _Float16 rhs[], _Float16 *result);
5454

55-
extern void nsc_div_array_scalar(const __fp16 lhs[], const __fp16 rhs, __fp16 *result);
55+
extern void nsc_div_array_scalar(const _Float16 lhs[], const _Float16 rhs, _Float16 *result);
5656

57-
extern void nsc_div(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result);
57+
extern void nsc_div(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result);
5858

5959

6060

‎Sources/NumSwiftC/numswiftc_base.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "time.h"
33

44
// MARK: - Sum
5-
extern __fp16 nsc_sum(const __fp16 array[]) {
6-
__fp16 sum = 0;
5+
extern _Float16 nsc_sum(const _Float16 array[]) {
6+
_Float16 sum = 0;
77

88
int size = sizeof(*array);
99

@@ -14,20 +14,20 @@ extern __fp16 nsc_sum(const __fp16 array[]) {
1414
}
1515

1616
// MARK: - Sum of Squares
17-
extern __fp16 nsc_sum_of_squares(const __fp16 array[]) {
17+
extern _Float16 nsc_sum_of_squares(const _Float16 array[]) {
1818

1919
int size = sizeof(*array);
20-
__fp16 sum = 0;
20+
_Float16 sum = 0;
2121
for (int i = 0; i < size; i++) {
2222
sum += array[i] * array[i];
2323
}
2424
return sum;
2525
}
2626

2727
// MARK: - Index of Min
28-
extern NSC_IndexedValue nsc_index_of_min(const __fp16 array[]) {
28+
extern NSC_IndexedValue nsc_index_of_min(const _Float16 array[]) {
2929
int size = sizeof(*array);
30-
__fp16 min = array[0];
30+
_Float16 min = array[0];
3131
int index = 0;
3232
for (int i = 1; i < size; i++) {
3333
if (array[i] < min) {
@@ -45,9 +45,9 @@ extern NSC_IndexedValue nsc_index_of_min(const __fp16 array[]) {
4545
}
4646

4747
// MARK: - Index of Max
48-
extern NSC_IndexedValue nsc_index_of_max(const __fp16 array[]) {
48+
extern NSC_IndexedValue nsc_index_of_max(const _Float16 array[]) {
4949
int size = sizeof(*array);
50-
__fp16 max = array[0];
50+
_Float16 max = array[0];
5151
int index = 0;
5252
for (int i = 1; i < size; i++) {
5353
if (array[i] > max) {
@@ -64,9 +64,9 @@ extern NSC_IndexedValue nsc_index_of_max(const __fp16 array[]) {
6464
}
6565

6666
// MARK: - Max
67-
extern __fp16 nsc_max(const __fp16 array[]) {
67+
extern _Float16 nsc_max(const _Float16 array[]) {
6868
int size = sizeof(*array);
69-
__fp16 max = array[0];
69+
_Float16 max = array[0];
7070
for (int i = 1; i < size; i++) {
7171
if (array[i] > max) {
7272
max = array[i];
@@ -76,9 +76,9 @@ extern __fp16 nsc_max(const __fp16 array[]) {
7676
}
7777

7878
// MARK: - Min
79-
extern __fp16 nsc_min(const __fp16 array[]) {
79+
extern _Float16 nsc_min(const _Float16 array[]) {
8080
int size = sizeof(*array);
81-
__fp16 min = array[0];
81+
_Float16 min = array[0];
8282
for (int i = 1; i < size; i++) {
8383
if (array[i] < min) {
8484
min = array[i];
@@ -88,21 +88,21 @@ extern __fp16 nsc_min(const __fp16 array[]) {
8888
}
8989

9090
// MARK: - Mean
91-
extern __fp16 nsc_mean(const __fp16 array[]) {
91+
extern _Float16 nsc_mean(const _Float16 array[]) {
9292
int size = sizeof(*array);
9393
return nsc_sum(array) / size;
9494
}
9595

9696
// MARK: - Add
9797

98-
extern void nsc_add_scalar(const __fp16 lhs, const __fp16 rhs[], __fp16 *result) {
98+
extern void nsc_add_scalar(const _Float16 lhs, const _Float16 rhs[], _Float16 *result) {
9999
int size = sizeof(*rhs);
100100
for (int i = 0; i < size; i++) {
101101
result[i] = rhs[i] + lhs;
102102
}
103103
}
104104

105-
extern void nsc_add(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
105+
extern void nsc_add(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result) {
106106
int size = sizeof(*lhs);
107107
for (int i = 0; i < size; i++) {
108108
result[i] = lhs[i] + rhs[i];
@@ -111,7 +111,7 @@ extern void nsc_add(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
111111

112112
// MARK: - Sub
113113

114-
extern void nsc_sub(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
114+
extern void nsc_sub(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result) {
115115
int size = sizeof(*lhs);
116116
for (int i = 0; i < size; i++) {
117117
result[i] = lhs[i] - rhs[i];
@@ -120,14 +120,14 @@ extern void nsc_sub(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
120120

121121
// MARK: - Mult
122122

123-
extern void nsc_mult_scalar(const __fp16 lhs, const __fp16 rhs[], __fp16 *result) {
123+
extern void nsc_mult_scalar(const _Float16 lhs, const _Float16 rhs[], _Float16 *result) {
124124
int size = sizeof(*rhs);
125125
for (int i = 0; i < size; i++) {
126126
result[i] = lhs * rhs[i];
127127
}
128128
}
129129

130-
extern void nsc_mult(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
130+
extern void nsc_mult(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result) {
131131
int size = sizeof(*lhs);
132132
for (int i = 0; i < size; i++) {
133133
result[i] = lhs[i] * rhs[i];
@@ -136,21 +136,21 @@ extern void nsc_mult(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
136136

137137
// MARK: - Div
138138

139-
extern void nsc_div(const __fp16 lhs[], const __fp16 rhs[], __fp16 *result) {
139+
extern void nsc_div(const _Float16 lhs[], const _Float16 rhs[], _Float16 *result) {
140140
int size = sizeof(*lhs);
141141
for (int i = 0; i < size; i++) {
142142
result[i] = lhs[i] / rhs[i];
143143
}
144144
}
145145

146-
extern void nsc_div_scalar_array(const __fp16 lhs, const __fp16 rhs[], __fp16 *result) {
146+
extern void nsc_div_scalar_array(const _Float16 lhs, const _Float16 rhs[], _Float16 *result) {
147147
int size = sizeof(*rhs);
148148
for (int i = 0; i < size; i++) {
149149
result[i] = lhs / rhs[i];
150150
}
151151
}
152152

153-
extern void nsc_div_array_scalar(const __fp16 lhs[], const __fp16 rhs, __fp16 *result) {
153+
extern void nsc_div_array_scalar(const _Float16 lhs[], const _Float16 rhs, _Float16 *result) {
154154
int size = sizeof(*lhs);
155155
for (int i = 0; i < size; i++) {
156156
result[i] = lhs[i] / rhs;

0 commit comments

Comments
 (0)