Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Former-commit-id: 397b422
  • Loading branch information
@Pencilcaseman
Pencilcaseman committed Feb 9, 2023
2 parents aa5f056 + da84c10 commit 5f89747
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors:
- family-names: "Davis"
given-names: "Toby"
title: "LibRapid: Optimised Mathematics for C++"
version: 0.6.5
date-released: "2023-02-03"
version: 0.6.6
date-released: "2023-02-09"
type: software
url: "https://github.com/LibRapid/librapid"
license: MIT
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "LibRapid"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = v0.6.5
PROJECT_NUMBER = v0.6.6

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
28 changes: 14 additions & 14 deletions test/test-array.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ namespace lrc = librapid;
#define TEST_CONSTRUCTORS(SCALAR, DEVICE) \
SECTION(fmt::format("Test Constructors [{} | {}]", STRINGIFY(SCALAR), STRINGIFY(DEVICE))) { \
lrc::Array<SCALAR, DEVICE> testA; \
REQUIRE(testA.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {0}); \
REQUIRE(testA.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {0}); \
\
lrc::Array<SCALAR, DEVICE> testB(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
REQUIRE(testB.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
lrc::Array<SCALAR, DEVICE> testB(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
REQUIRE(testB.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
\
lrc::Array<SCALAR, DEVICE> testC(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}, 5); \
REQUIRE(testC.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
lrc::Array<SCALAR, DEVICE> testC(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}, 5); \
REQUIRE(testC.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
REQUIRE(testC.storage()[0] == 5); \
REQUIRE(testC.storage()[1] == 5); \
REQUIRE(testC.storage()[2] == 5); \
Expand All @@ -28,20 +28,20 @@ namespace lrc = librapid;
REQUIRE(testD.storage()[2] == 3); \
REQUIRE(testD.storage()[3] == 3); \
\
lrc::Array<SCALAR, DEVICE>::ShapeType tmpShape({2, 3}); \
lrc::Array<SCALAR, DEVICE>::ShapeType tmpShape({2, 3}); \
lrc::Array<SCALAR, DEVICE> testE(std::move(tmpShape)); \
REQUIRE(testE.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {2, 3}); \
REQUIRE(testE.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {2, 3}); \
\
lrc::Array<SCALAR, DEVICE> testF(testC); \
REQUIRE(testF.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
REQUIRE(testF.shape() == lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}); \
REQUIRE(testF.storage()[0] == 5); \
REQUIRE(testF.storage()[1] == 5); \
REQUIRE(testF.storage()[2] == 5); \
REQUIRE(testF.storage()[9] == 5); \
REQUIRE(testF.storage()[10] == 5); \
REQUIRE(testF.storage()[11] == 5); \
\
lrc::Array<SCALAR, DEVICE> testG(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}, 10); \
lrc::Array<SCALAR, DEVICE> testG(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 4}, 10); \
testC = testG; \
REQUIRE(testC.storage()[0] == 10); \
REQUIRE(testC.storage()[1] == 10); \
Expand All @@ -50,7 +50,7 @@ namespace lrc = librapid;
REQUIRE(testC.storage()[10] == 10); \
REQUIRE(testC.storage()[11] == 10); \
\
lrc::Array<SCALAR, DEVICE> testH(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 3}); \
lrc::Array<SCALAR, DEVICE> testH(lrc::Array<SCALAR, DEVICE>::ShapeType {3, 3}); \
testH << 1, 2, 3, 4, 5, 6, 7, 8, 9; \
REQUIRE(testH.storage()[0] == 1); \
REQUIRE(testH.storage()[1] == 2); \
Expand All @@ -65,7 +65,7 @@ namespace lrc = librapid;

#define TEST_INDEXING(SCALAR, DEVICE) \
SECTION(fmt::format("Test Indexing [{} | {}]", STRINGIFY(SCALAR), STRINGIFY(DEVICE))) { \
lrc::Array<SCALAR, DEVICE> testA(lrc::Array<SCALAR, DEVICE>::ShapeType({5, 3})); \
lrc::Array<SCALAR, DEVICE> testA(lrc::Array<SCALAR, DEVICE>::ShapeType({5, 3})); \
testA << 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15; \
std::string index0 = fmt::format("[{} {} {}]", SCALAR(1), SCALAR(2), SCALAR(3)); \
std::string index1 = fmt::format("[{} {} {}]", SCALAR(4), SCALAR(5), SCALAR(6)); \
Expand Down Expand Up @@ -96,7 +96,7 @@ namespace lrc = librapid;
#define TEST_STRING_FORMATTING(SCALAR, DEVICE) \
SECTION( \
fmt::format("Test String Formatting [{} | {}]", STRINGIFY(SCALAR), STRINGIFY(DEVICE))) { \
lrc::Array<SCALAR, DEVICE> testA(lrc::Array<SCALAR, DEVICE>::ShapeType({2, 3})); \
lrc::Array<SCALAR, DEVICE> testA(lrc::Array<SCALAR, DEVICE>::ShapeType({2, 3})); \
testA << 1, 2, 3, 4, 5, 6; \
\
REQUIRE(testA.str() == fmt::format("[[{} {} {}]\n [{} {} {}]]", \
Expand All @@ -107,7 +107,7 @@ namespace lrc = librapid;
SCALAR(5), \
SCALAR(6))); \
\
lrc::Array<SCALAR, DEVICE> testB(lrc::Array<SCALAR, DEVICE>::ShapeType({2, 3})); \
lrc::Array<SCALAR, DEVICE> testB(lrc::Array<SCALAR, DEVICE>::ShapeType({2, 3})); \
testB << 10, 2, 3, 4, 5, 6; \
\
REQUIRE(testB.str() == fmt::format("[[{} {} {}]\n [ {} {} {}]]", \
Expand Down Expand Up @@ -180,7 +180,7 @@ namespace lrc = librapid;

#define TEST_COMPARISONS(SCALAR, DEVICE) \
SECTION(fmt::format("Test Operations [{} | {}]", STRINGIFY(SCALAR), STRINGIFY(DEVICE))) { \
lrc::Array<SCALAR, DEVICE>::ShapeType shape({37, 41}); \
lrc::Array<SCALAR, DEVICE>::ShapeType shape({53, 79}); \
lrc::Array<SCALAR, DEVICE> testA(shape); /* Prime-dimensioned to force wrapping */ \
lrc::Array<SCALAR, DEVICE> testB(shape); \
\
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MAJOR 0
MINOR 6
PATCH 5
PATCH 6

0 comments on commit 5f89747

Please sign in to comment.