Skip to content

Commit

Permalink
Change ONETBB_SPEC_VERSION macro to align with the latest oneAPI spec (
Browse files Browse the repository at this point in the history
  • Loading branch information
kboyarinov authored Jan 30, 2025
1 parent 3c85ad7 commit c02c2d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions include/oneapi/tbb/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
__TBB_VERSION_SUFFIX

// OneAPI oneTBB specification version
#define ONETBB_SPEC_VERSION "1.0"
#define ONETBB_SPEC_VERSION 104
// Full interface version
#define TBB_INTERFACE_VERSION 12150
// Major interface version
Expand All @@ -62,7 +62,7 @@
//TBB_REVAMP_TODO: consider enabling version_string.ver generation
//TBB_REVAMP_TODO: #include "version_string.ver"

#define __TBB_ONETBB_SPEC_VERSION(N) #N ": SPECIFICATION VERSION\t" ONETBB_SPEC_VERSION TBB_ENDL
#define __TBB_ONETBB_SPEC_VERSION(N) #N ": SPECIFICATION VERSION\t" __TBB_STRING(ONETBB_SPEC_VERSION) TBB_ENDL
#define __TBB_VERSION_NUMBER(N) #N ": VERSION\t\t" TBB_VERSION_STRING TBB_ENDL
#define __TBB_INTERFACE_VERSION_NUMBER(N) #N ": INTERFACE VERSION\t" __TBB_STRING(TBB_INTERFACE_VERSION) TBB_ENDL

Expand Down
6 changes: 3 additions & 3 deletions test/conformance/conformance_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2020-2023 Intel Corporation
Copyright (c) 2020-2025 Intel Corporation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -25,8 +25,8 @@
//! Testing the match of compile-time oneTBB specification version
//! \brief \ref requirement \ref interface
TEST_CASE("Test specification version") {
const char* expected = "1.0";
REQUIRE_MESSAGE(std::strcmp(expected, ONETBB_SPEC_VERSION) == 0,
int expected = 104;
REQUIRE_MESSAGE(ONETBB_SPEC_VERSION == expected,
"Expected and actual specification versions do not match.");
}

Expand Down

0 comments on commit c02c2d2

Please sign in to comment.