Skip to content

Commit 945459f

Browse files
committed
Bump up support TF version to 2.18
- removes build in support for 2.16.x (still the plugin can be compiled on the fly) - bumps TF 2.17.0 -> 2.17.1 - adds TF 2.18 support - adjust TF version detection for the most recent TF version - different include file needs to be used Signed-off-by: Janusz Lisiecki <[email protected]>
1 parent f2e080e commit 945459f

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

dali_tf_plugin/dali_dataset_op.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919

2020

2121
#include "tensorflow/core/public/version.h"
22+
// in the most recent version of tensorflow, the version is defined in the release_version.h file
23+
#if not defined(TF_MAJOR_VERSION) || not defined(TF_MINOR_VERSION) || not defined(TF_PATCH_VERSION)
24+
#include "tensorflow/core/public/release_version.h"
25+
#endif
2226

2327
#if TF_MAJOR_VERSION == 2 || (TF_MAJOR_VERSION == 1 && TF_MINOR_VERSION >= 15)
2428

dali_tf_plugin/daliop.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
#include "tensorflow/core/framework/op.h"
2020
#include "tensorflow/core/public/version.h"
21+
// in the most recent version of tensorflow, the version is defined in the release_version.h file
22+
#if not defined(TF_MAJOR_VERSION) || not defined(TF_MINOR_VERSION) || not defined(TF_PATCH_VERSION)
23+
#include "tensorflow/core/public/release_version.h"
24+
#endif
2125

2226
// for Eigen::GpuDevice
2327
#define EIGEN_USE_GPU

qa/setup_packages.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,16 +516,16 @@ def get_pyvers_name(self, url, cuda_version):
516516
],
517517
"120": [
518518
PckgVer(
519-
"2.16.2",
519+
"2.17.1",
520520
python_min_ver="3.9",
521521
alias="tensorflow",
522-
dependencies=["protobuf<4", "urllib3<2.0", "tf_keras==2.16"],
522+
dependencies=["protobuf<4", "urllib3<2.0", "tf_keras==2.17"],
523523
),
524524
PckgVer(
525-
"2.17.0",
525+
"2.18.0",
526526
python_min_ver="3.9",
527-
alias="tensorflow",
528-
dependencies=["protobuf<4", "urllib3<2.0", "tf_keras==2.17"],
527+
alias="tensorflow[and-cuda]",
528+
dependencies=["protobuf<4", "urllib3<2.0", "tf_keras==2.18"],
529529
),
530530
],
531531
},

0 commit comments

Comments
 (0)