From a54cc1e6db0df7a9454cf47d3a2a924a86e65cc8 Mon Sep 17 00:00:00 2001 From: Toby Davis Date: Thu, 9 Nov 2023 11:53:01 +0000 Subject: [PATCH] Update clang-format --- .github/workflows/continuous-integration.yaml | 10 +++++----- librapid/__init__.py | 12 ++++++------ librapid/bindings/generators/arrayGenerator.py | 8 ++++---- .../bindings/generators/generalArrayViewGenerator.py | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index d6b2b5b6..f9505274 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -290,7 +290,7 @@ jobs: if: matrix.os == 'macos-latest' uses: maxim-lobanov/setup-xcode@v1.5.1 with: - xcode-version: latest + xcode-version: latest # Tests must pass in both debug and release mode - name: Compile (Debug) @@ -394,7 +394,7 @@ jobs: run: | sudo apt --fix-broken install sudo apt-get install python3-sphinx - + - name: Configure Files run: | touch .is_local @@ -428,14 +428,14 @@ jobs: - os: ubuntu-latest cc: ../../llvm/bin/clang cxx: ../../llvm/bin/clang++ - clangVer: "15.0" + clangVer: "16.0" smallArrays: ON pretty: "LibRapid_Ubuntu_Clang_OptimiseSmallArrays" - os: ubuntu-latest cc: ../../llvm/bin/clang cxx: ../../llvm/bin/clang++ - clangVer: "15.0" + clangVer: "16.0" smallArrays: OFF pretty: "LibRapid_Ubuntu_Clang" @@ -607,7 +607,7 @@ jobs: run: | cd IntermediateBenchmarkResults tree - + - name: Upload Intermediate Benchmark Results uses: actions/upload-artifact@v3 with: diff --git a/librapid/__init__.py b/librapid/__init__.py index 02214aa1..7e5a900a 100644 --- a/librapid/__init__.py +++ b/librapid/__init__.py @@ -247,8 +247,8 @@ def getSeed(): __cpuTypeList = { int32: _librapid.ArrayInt32CPU, int64: _librapid.ArrayInt64CPU, - # uint32: _librapid.ArrayUInt32CPU, - # uint64: _librapid.ArrayUInt64CPU, + uint32: _librapid.ArrayUInt32CPU, + uint64: _librapid.ArrayUInt64CPU, float32: _librapid.ArrayFloatCPU, float64: _librapid.ArrayDoubleCPU, # Complex32: _librapid.ArrayComplexFloatCPU, @@ -259,8 +259,8 @@ def getSeed(): __openclTypeList = { int32: _librapid.ArrayInt32OpenCL, int64: _librapid.ArrayInt64OpenCL, - # uint32: _librapid.ArrayUInt32OpenCL, - # uint64: _librapid.ArrayUInt64OpenCL, + uint32: _librapid.ArrayUInt32OpenCL, + uint64: _librapid.ArrayUInt64OpenCL, float32: _librapid.ArrayFloatOpenCL, float64: _librapid.ArrayDoubleOpenCL, # Complex32: _librapid.ArrayComplexFloatOpenCL, @@ -273,8 +273,8 @@ def getSeed(): __cudaTypeList = { int32: _librapid.ArrayInt32CUDA, int64: _librapid.ArrayInt64CUDA, - # uint32: _librapid.ArrayUInt32CUDA, - # uint64: _librapid.ArrayUInt64CUDA, + uint32: _librapid.ArrayUInt32CUDA, + uint64: _librapid.ArrayUInt64CUDA, float32: _librapid.ArrayFloatCUDA, float64: _librapid.ArrayDoubleCUDA, # Complex32: _librapid.ArrayComplexFloatCUDA, diff --git a/librapid/bindings/generators/arrayGenerator.py b/librapid/bindings/generators/arrayGenerator.py index ed3c2dc8..bffa169f 100644 --- a/librapid/bindings/generators/arrayGenerator.py +++ b/librapid/bindings/generators/arrayGenerator.py @@ -11,12 +11,12 @@ for scalar in [("int32_t", "Int32"), ("int64_t", "Int64"), - # ("uint32_t", "UInt32"), - # ("uint64_t", "UInt64"), + ("uint32_t", "UInt32"), + ("uint64_t", "UInt64"), ("float", "Float"), ("double", "Double"), - # ("lrc::Complex", "ComplexFloat"), - # ("lrc::Complex", "ComplexDouble") + ("lrc::Complex", "ComplexFloat"), + ("lrc::Complex", "ComplexDouble") ]: for backend in ["CPU"]: # ["CPU", "OpenCL", "CUDA"]: arrayTypes.append({ diff --git a/librapid/bindings/generators/generalArrayViewGenerator.py b/librapid/bindings/generators/generalArrayViewGenerator.py index 7464ee99..062baba2 100644 --- a/librapid/bindings/generators/generalArrayViewGenerator.py +++ b/librapid/bindings/generators/generalArrayViewGenerator.py @@ -11,12 +11,12 @@ for scalar in [("int32_t", "Int32"), ("int64_t", "Int64"), - # ("uint32_t", "UInt32"), - # ("uint64_t", "UInt64"), + ("uint32_t", "UInt32"), + ("uint64_t", "UInt64"), ("float", "Float"), ("double", "Double"), - # ("lrc::Complex", "ComplexFloat"), - # ("lrc::Complex", "ComplexDouble") + ("lrc::Complex", "ComplexFloat"), + ("lrc::Complex", "ComplexDouble") ]: for backend in ["CPU"]: # ["CPU", "OpenCL", "CUDA"]: arrayTypes.append({