From 0d2ccfbd3c7f89007cb2c014279af8ede2dc7b42 Mon Sep 17 00:00:00 2001 From: yuyang18 Date: Mon, 9 Jul 2018 14:03:22 +0800 Subject: [PATCH] Remove atomic --- paddle/fluid/framework/reader.cc | 4 +--- paddle/fluid/framework/reader.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/paddle/fluid/framework/reader.cc b/paddle/fluid/framework/reader.cc index 0f2f4387aa..3231b2ab27 100644 --- a/paddle/fluid/framework/reader.cc +++ b/paddle/fluid/framework/reader.cc @@ -18,9 +18,7 @@ namespace paddle { namespace framework { void ReaderBase::ReadNext(std::vector *out) { - if (status_ != ReaderStatus::kRunning) { - PADDLE_THROW("The reader is not at the status of 'running'."); - } + PADDLE_ENFORCE_EQ(status_, ReaderStatus::kRunning); ReadNextImpl(out); } diff --git a/paddle/fluid/framework/reader.h b/paddle/fluid/framework/reader.h index 91108544ac..9dc5fce4aa 100644 --- a/paddle/fluid/framework/reader.h +++ b/paddle/fluid/framework/reader.h @@ -14,7 +14,6 @@ #pragma once -#include #include #include @@ -44,7 +43,7 @@ class ReaderBase { virtual void StartImpl() = 0; - std::atomic status_{kRunning}; + ReaderStatus status_{kRunning}; }; class DecoratedReader : public ReaderBase { -- GitLab