Skip to content

Commit

Permalink
supressed deplicate warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jjjkkkjjj committed Jan 29, 2024
1 parent 7e190f1 commit bf07973
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 47 deletions.
8 changes: 4 additions & 4 deletions Sources/Matft/core/util/common/type.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal func to_Bool_mm_op<U: MfStorable>(l_mfarray: MfArray, r_mfarray: MfArra
withDataMBPtr_multi(datatype: U.self, l_mfarray, r_mfarray){
lptr, rptr in
var val = op(lptr.baseAddress!.pointee, rptr.baseAddress!.pointee) ? Float(1) : Float.zero
(dstptrT + i).assign(from: &val, count: 1)
(dstptrT + i).update(from: &val, count: 1)
i += 1
}
}
Expand All @@ -60,7 +60,7 @@ internal func to_Bool_ms_op<U: MfStorable>(l_mfarray: MfArray, r_scalar: U, op:
[unowned ret] (dataptr) in
var newptr = dataptr.map{ $0 > r_scalar ? Float.zero : Float(1) }
newptr.withUnsafeMutableBufferPointer{
dataptr.baseAddress!.moveAssign(from: $0.baseAddress!, count: ret.storedSize)
dataptr.baseAddress!.moveUpdate(from: $0.baseAddress!, count: ret.storedSize)
}
}
ret.mfdata._mftype = .Bool
Expand All @@ -75,7 +75,7 @@ internal func to_Bool_sm_op<U: MfStorable>(l_scalar: U, r_mfarray: MfArray, op:
r_mfarray.withContiguousDataUnsafeMPtrT(datatype: U.self){
rptr in
var val = op(l_scalar, rptr.pointee) ? Float(1) : Float.zero
(dstptrT + i).assign(from: &val, count: 1)
(dstptrT + i).update(from: &val, count: 1)
i += 1
}
}
Expand Down Expand Up @@ -123,7 +123,7 @@ internal func bool_broadcast_to(_ mfarray: MfArray, shape: [Int]) -> MfArray{
rowc_mfarray.withUnsafeMutableStartPointer(datatype: Float.self){
srcptr in
for i in 0..<origSize{
dstptrF.assign(repeating: (srcptr + i).pointee, count: offset)
dstptrF.update(repeating: (srcptr + i).pointee, count: offset)
dstptrF += offset
}
}
Expand Down
16 changes: 8 additions & 8 deletions Sources/Matft/core/util/typeconversion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ internal func get_mftype(_ flattenArray: inout [Any]) -> MfType{
internal func array2UnsafeMPtrT<T: MfTypable>(_ array: inout [T]) -> UnsafeMutablePointer<T>{
let ptr = allocate_unsafeMPtrT(type: T.self, count: array.count)
array.withUnsafeBufferPointer{
ptr.assign(from: $0.baseAddress!, count: $0.count)
ptr.update(from: $0.baseAddress!, count: $0.count)
}
return ptr
}
Expand Down Expand Up @@ -131,7 +131,7 @@ internal func allocate_floatdata_from_flattenArray(_ flattenArray: inout [Any],
else if var flattenArray = flattenArray as? [Float]{
let ptrF = allocate_unsafeMPtrT(type: Float.self, count: flattenArray.count)
let _ = flattenArray.withUnsafeMutableBufferPointer{
ptrF.assign(from: $0.baseAddress!, count: $0.count)
ptrF.update(from: $0.baseAddress!, count: $0.count)
}
return UnsafeMutableRawPointer(ptrF)
}
Expand All @@ -141,7 +141,7 @@ internal func allocate_floatdata_from_flattenArray(_ flattenArray: inout [Any],
// true = 1, false = 0
var flattenBoolarray = flattenArray.map{ $0 ? Float.num(1) : Float.zero }
let _ = flattenBoolarray.withUnsafeMutableBufferPointer{
ptrF.moveAssign(from: $0.baseAddress!, count: $0.count)
ptrF.moveUpdate(from: $0.baseAddress!, count: $0.count)
}
return UnsafeMutableRawPointer(ptrF)
}
Expand All @@ -151,7 +151,7 @@ internal func allocate_floatdata_from_flattenArray(_ flattenArray: inout [Any],
else if let flattenArray = flattenArray as? [DSPComplex]{
let ptrF = allocate_unsafeMPtrT(type: Float.self, count: flattenArray.count*2)
let _ = flattenArray.withUnsafeBytes{
ptrF.assign(from: $0.bindMemory(to: Float.self).baseAddress!, count: flattenArray.count*2)
ptrF.update(from: $0.bindMemory(to: Float.self).baseAddress!, count: flattenArray.count*2)
}
return UnsafeMutableRawPointer(ptrF)
}
Expand Down Expand Up @@ -231,14 +231,14 @@ internal func allocate_doubledata_from_flattenArray(_ flattenArray: inout [Any],
// true = 1, false = 0
var flattenBoolarray = flattenArray.map{ $0 ? Double.num(1) : Double.zero }
let _ = flattenBoolarray.withUnsafeMutableBufferPointer{
ptrD.moveAssign(from: $0.baseAddress!, count: $0.count)
ptrD.moveUpdate(from: $0.baseAddress!, count: $0.count)
}
return UnsafeMutableRawPointer(ptrD)
}
else if var flattenArray = flattenArray as? [Double]{
let ptrD = allocate_unsafeMPtrT(type: Double.self, count: flattenArray.count)
let _ = flattenArray.withUnsafeMutableBufferPointer{
ptrD.assign(from: $0.baseAddress!, count: $0.count)
ptrD.update(from: $0.baseAddress!, count: $0.count)
}
return UnsafeMutableRawPointer(ptrD)
}
Expand All @@ -253,7 +253,7 @@ internal func allocate_doubledata_from_flattenArray(_ flattenArray: inout [Any],
else if let flattenArray = flattenArray as? [DSPDoubleComplex]{
let ptrD = allocate_unsafeMPtrT(type: Double.self, count: flattenArray.count*2)
let _ = flattenArray.withUnsafeBytes{
ptrD.assign(from: $0.bindMemory(to: Double.self).baseAddress!, count: flattenArray.count*2)
ptrD.update(from: $0.bindMemory(to: Double.self).baseAddress!, count: flattenArray.count*2)
}
return UnsafeMutableRawPointer(ptrD)
}
Expand All @@ -266,7 +266,7 @@ fileprivate func _U2Binary<U: MfStorable>(_ ptrU: UnsafeMutableBufferPointer<U>)
let size = ptrU.count
var arrBinary = ptrU.map{ $0 == U.zero ? U.zero : U.num(1) }
arrBinary.withUnsafeMutableBufferPointer{
ptrU.baseAddress!.moveAssign(from: $0.baseAddress!, count: size)
ptrU.baseAddress!.moveUpdate(from: $0.baseAddress!, count: size)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Matft/function/method/subscript.swift
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ fileprivate func _setter<T: MfStorable>(_ mfarray: MfArray, _ indices: MfArray,
let srcptr = assptr
mfarray.withContiguousDataUnsafeMPtrT(datatype: T.self){
if (indptr + indoffset).pointee != T.zero{
$0.assign(from: srcptr + srcoffset, count: 1)
$0.update(from: srcptr + srcoffset, count: 1)
srcoffset += 1
//print(srcptr.pointee)
}
Expand Down
14 changes: 7 additions & 7 deletions Sources/Matft/function/static/conversion+static.swift
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ extension Matft{
let newstructure = withDummyShapeStridesMBPtr(new_ndim){
shapeptr, stridesptr in
//move from newshape
shapeptr.baseAddress!.moveAssign(from: &newshape, count: new_ndim)
shapeptr.baseAddress!.moveUpdate(from: &newshape, count: new_ndim)

for axis in 0..<new_ndim{

Expand Down Expand Up @@ -362,9 +362,9 @@ extension Matft{
- max: (optional) Maximum value. If nil is passed, handled as inf
*/
public static func clip<T: MfTypable>(_ mfarray: MfArray, min: T? = nil, max: T? = nil) -> MfArray{
func _clip<T: MfStorable>(_ vDSP_func: vDSP_clip_func<T>) -> MfArray{
let min = min == nil ? -T.infinity : T.from(min!)
let max = max == nil ? T.infinity : T.from(max!)
func _clip<U: MfStorable>(_ vDSP_func: vDSP_clip_func<U>) -> MfArray{
let min = min == nil ? -U.infinity : U.from(min!)
let max = max == nil ? U.infinity : U.from(max!)
return clip_by_vDSP(mfarray, min, max, vDSP_func)
}

Expand Down Expand Up @@ -585,7 +585,7 @@ fileprivate func _unique<T: MfStorable>(_ flattendata: inout [T], restShape: ino
newdata.withUnsafeMutableStartPointer(datatype: T.self){
dstptrT in
uniquearray.withUnsafeMutableBufferPointer{
dstptrT.moveAssign(from: $0.baseAddress!, count: newsize)
dstptrT.moveUpdate(from: $0.baseAddress!, count: newsize)
}
}

Expand Down Expand Up @@ -626,11 +626,11 @@ extension Matft.mfdata{

//copy shape
let shapeptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
shapeptr.assign(from: mfdata._shape, count: mfdata._ndim)
shapeptr.update(from: mfdata._shape, count: mfdata._ndim)

//copy strides
let stridesptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
stridesptr.assign(from: mfdata._strides, count: mfdata._ndim)
stridesptr.update(from: mfdata._strides, count: mfdata._ndim)

switch newStoredType{
case .Float://double to float
Expand Down
16 changes: 8 additions & 8 deletions Sources/Matft/function/static/creation+static.swift
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extension Matft{
newdata.withUnsafeMutableStartPointer(datatype: U.self){
ptrU in
arr.withUnsafeMutableBufferPointer{
ptrU.moveAssign(from: $0.baseAddress!, count: size)
ptrU.moveUpdate(from: $0.baseAddress!, count: size)
}
}
}
Expand Down Expand Up @@ -182,7 +182,7 @@ extension Matft{
newdata.withUnsafeMutableStartPointer(datatype: T.self){
ptrT in
d.withUnsafeMutableBufferPointer{
ptrT.moveAssign(from: $0.baseAddress!, count: size)
ptrT.moveUpdate(from: $0.baseAddress!, count: size)
}
}
}
Expand Down Expand Up @@ -439,21 +439,21 @@ extension Matft.mfdata{

//copy shape
let shapeptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
shapeptr.assign(from: mfdata._shape, count: mfdata._ndim)
shapeptr.update(from: mfdata._shape, count: mfdata._ndim)

//copy strides
let stridesptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
stridesptr.assign(from: mfdata._strides, count: mfdata._ndim)
stridesptr.update(from: mfdata._strides, count: mfdata._ndim)

//copy data
switch mfdata._storedType {
case .Float:
let dataptr = create_unsafeMRPtr(type: Float.self, count: mfdata._size)
dataptr.assumingMemoryBound(to: Float.self).assign(from: mfdata._data.assumingMemoryBound(to: Float.self), count: mfdata._storedSize)
dataptr.assumingMemoryBound(to: Float.self).update(from: mfdata._data.assumingMemoryBound(to: Float.self), count: mfdata._storedSize)
return MfData(dataptr: dataptr, storedSize: mfdata._storedSize, shapeptr: shapeptr, mftype: mfdata._mftype, ndim: mfdata._ndim, stridesptr: stridesptr)
case .Double:
let dataptr = create_unsafeMRPtr(type: Double.self, count: mfdata._size)
dataptr.assumingMemoryBound(to: Double.self).assign(from: mfdata._data.assumingMemoryBound(to: Double.self), count: mfdata._storedSize)
dataptr.assumingMemoryBound(to: Double.self).update(from: mfdata._data.assumingMemoryBound(to: Double.self), count: mfdata._storedSize)
return MfData(dataptr: dataptr, storedSize: mfdata._storedSize, shapeptr: shapeptr, mftype: mfdata._mftype, ndim: mfdata._ndim, stridesptr: stridesptr)
}
}
Expand All @@ -465,11 +465,11 @@ extension Matft.mfdata{
static public func shallowcopy(_ mfdata: MfData) -> MfData{
//copy shape
let shapeptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
shapeptr.assign(from: mfdata._shape, count: mfdata._ndim)
shapeptr.update(from: mfdata._shape, count: mfdata._ndim)

//copy strides
let stridesptr = create_unsafeMPtrT(type: Int.self, count: mfdata._ndim)
stridesptr.assign(from: mfdata._strides, count: mfdata._ndim)
stridesptr.update(from: mfdata._strides, count: mfdata._ndim)

let newdata = MfData(refdata: mfdata, offset: 0, shapeptr: shapeptr, ndim: mfdata._ndim, mforder: mfdata._order, stridesptr: stridesptr)

Expand Down
4 changes: 2 additions & 2 deletions Sources/Matft/library/cblas.swift
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ internal func fancyset_by_cblas<T: MfStorable>(_ mfarray: MfArray, _ indices: Mf
let _ = assignedMfarray.withUnsafeMutableStartPointer(datatype: T.self){
srcptr in
for (i, offset) in offsets.enumerated(){
(dstptr + offset).assign(from: srcptr + i, count: 1)
(dstptr + offset).update(from: srcptr + i, count: 1)
}
}
}
Expand Down Expand Up @@ -671,7 +671,7 @@ internal func fancysetall_by_cblas<T: MfStorable>(_ mfarray: MfArray, _ indices:
[unowned assignedMfarray](srcptr) in
if workShape.count == 0{// indices.count == mfarray.ndim
for (i, offset) in offsets.enumerated(){
(dstptr + offset).assign(from: srcptr + i, count: 1)
(dstptr + offset).update(from: srcptr + i, count: 1)
}
}
else{
Expand Down
4 changes: 2 additions & 2 deletions Sources/Matft/library/extvDSP.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func evDSP_sign(_ __A: UnsafePointer<Float>, _ __IA: vDSP_Stride, _ __B: UnsafeP
else{
tmp = .zero
}
dptr.assign(from: &tmp, count: 1)
dptr.update(from: &tmp, count: 1)
aptr += strideA
dptr += strideD
}
Expand Down Expand Up @@ -98,7 +98,7 @@ func evDSP_signD(_ __A: UnsafePointer<Double>, _ __IA: vDSP_Stride, _ __B: Unsaf
else{
tmp = .zero
}
__D.assign(from: &tmp, count: 1)
__D.update(from: &tmp, count: 1)
__A += strideA
__D += strideD
}
Expand Down
24 changes: 12 additions & 12 deletions Sources/Matft/library/lapack.swift
Original file line number Diff line number Diff line change
Expand Up @@ -284,24 +284,24 @@ internal func wrap_lapack_eigen<T: MfStorable>(_ rowcolnum: Int, _ srcptr: Unsaf
}

}
//moveAssign
//moveUpdate
WR.withUnsafeMutableBufferPointer{
dstValRePtr.moveAssign(from: $0.baseAddress!, count: rowcolnum)
dstValRePtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum)
}
WI.withUnsafeMutableBufferPointer{
dstValImPtr.moveAssign(from: $0.baseAddress!, count: rowcolnum)
dstValImPtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum)
}
VLRe.withUnsafeMutableBufferPointer{
dstLVecRePtr.moveAssign(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
dstLVecRePtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
}
VLIm.withUnsafeMutableBufferPointer{
dstLVecImPtr.moveAssign(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
dstLVecImPtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
}
VRRe.withUnsafeMutableBufferPointer{
dstRVecRePtr.moveAssign(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
dstRVecRePtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
}
VRIm.withUnsafeMutableBufferPointer{
dstRVecImPtr.moveAssign(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
dstRVecImPtr.moveUpdate(from: $0.baseAddress!, count: rowcolnum*rowcolnum)
}
}
}
Expand Down Expand Up @@ -382,13 +382,13 @@ internal func wrap_lapack_svd<T: MfStorable>(_ rownum: Int, _ colnum: Int, _ src
}
else{
U.withUnsafeMutableBufferPointer{
vptr.moveAssign(from: $0.baseAddress!, count: rownum*ucol)
vptr.moveUpdate(from: $0.baseAddress!, count: rownum*ucol)
}
S.withUnsafeMutableBufferPointer{
sptr.moveAssign(from: $0.baseAddress!, count: snum)
sptr.moveUpdate(from: $0.baseAddress!, count: snum)
}
VT.withUnsafeMutableBufferPointer{
rtptr.moveAssign(from: $0.baseAddress!, count: colnum*vtrow)
rtptr.moveUpdate(from: $0.baseAddress!, count: colnum*vtrow)
}
}
}
Expand Down Expand Up @@ -520,7 +520,7 @@ internal func inv_by_lapack<T: MfStorable>(_ mfarray: MfArray, _ lapack_func_lu:
try wrap_lapack_inv(row, srcptr, &IPIV, lapack_func: lapack_func_inv)

//move
(dstptrT + offset).moveAssign(from: srcptr, count: row*col)
(dstptrT + offset).moveUpdate(from: srcptr, count: row*col)
}
}

Expand Down Expand Up @@ -566,7 +566,7 @@ internal func det_by_lapack<T: MfStorable>(_ mfarray: MfArray, _ lapack_func: la
}

//assign
(dstptrT + dst_offset).assign(from: &det, count: 1)
(dstptrT + dst_offset).update(from: &det, count: 1)
dst_offset += 1
}
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/Matft/library/vDSP.swift
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ internal func argsort_by_vDSP<T: MfStorable>(_ mfarray: MfArray, _ axis: Int, _
//convert dataptr(int) to float
var flarray = uiarray.map{ Float($0) }
flarray.withUnsafeMutableBufferPointer{
(dstptrF + offset).moveAssign(from: $0.baseAddress!, count: count)
(dstptrF + offset).moveUpdate(from: $0.baseAddress!, count: count)
}

offset += count
Expand Down Expand Up @@ -1102,11 +1102,11 @@ internal func arange_by_vDSP<T: MfStorable>(_ start: T, _ by: T, _ count: Int, _
let newstructure = withDummyShapeStridesMBPtr(retShape.count){
shapeptr, stridesptr in
retShape.withUnsafeMutableBufferPointer{
shapeptr.baseAddress!.moveAssign(from: $0.baseAddress!, count: shapeptr.count)
shapeptr.baseAddress!.moveUpdate(from: $0.baseAddress!, count: shapeptr.count)
}

let newstrides = shape2strides(shapeptr, mforder: .Row)
stridesptr.baseAddress!.moveAssign(from: newstrides.baseAddress!, count: shapeptr.count)
stridesptr.baseAddress!.moveUpdate(from: newstrides.baseAddress!, count: shapeptr.count)

newstrides.deallocate()
}
Expand Down

0 comments on commit bf07973

Please sign in to comment.