rename api.h to paddle_inference_api.h, put demo_ci in fluid_install_dir

guochaorong-patch-1
Luo Tao 7 years ago
parent 7b719760d5
commit 2e68abf47c

@ -149,8 +149,10 @@ if (WITH_ANAKIN AND WITH_GPU)
endif()
copy(inference_api_lib DEPS paddle_inference_api paddle_inference_api_shared
SRCS ${src_dir}/${module}/api.h ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/libpaddle_inference_api*
DSTS ${dst_dir}/inference ${dst_dir}/inference
SRCS ${src_dir}/${module}/paddle_inference_api.h
${src_dir}/${module}/demo_ci
${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/libpaddle_inference_api*
DSTS ${dst_dir}/inference ${dst_dir}/inference ${dst_dir}/inference
)
list(APPEND inference_deps inference_api_lib)

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
namespace paddle {

@ -20,7 +20,7 @@ limitations under the License. */
#pragma once
#include <vector>
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
// from anakin
#include "framework/core/net/net.h"

@ -16,7 +16,7 @@ limitations under the License. */
#include <glog/logging.h>
#include <gtest/gtest.h>
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
DEFINE_string(model, "", "Directory of the inference model.");

@ -19,7 +19,7 @@
#include <string>
#include <vector>
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
#include "paddle/fluid/framework/ddim.h"
#include "paddle/fluid/framework/lod_tensor.h"

@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/analysis/analyzer.h"
#include "paddle/fluid/inference/api/api_impl.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
#include "paddle/fluid/inference/utils/singleton.h"
namespace paddle {

@ -20,7 +20,7 @@ limitations under the License. */
#include <glog/logging.h>
#include <memory>
#include <thread> //NOLINT
#include "paddle/fluid/inference/api.h"
#include "paddle/fluid/inference/paddle_inference_api.h"
#include "paddle/fluid/platform/enforce.h"
DEFINE_string(dirname, "", "Directory of the inference model.");

@ -16,7 +16,7 @@
#include <algorithm>
#include <string>
#include <vector>
#include "paddle/fluid/inference/api.h"
#include "paddle/fluid/inference/paddle_inference_api.h"
namespace paddle {
namespace demo {

@ -14,7 +14,7 @@ limitations under the License. */
#include <glog/logging.h>
#include <gtest/gtest.h>
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
namespace paddle {

@ -15,7 +15,7 @@
#include <gflags/gflags.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
#include "paddle/fluid/inference/api/api.h"
#include "paddle/fluid/inference/api/paddle_inference_api.h"
namespace paddle {

Loading…
Cancel
Save