From c4a8e4d6dba7a9234540e9a4905938e1b709b7b7 Mon Sep 17 00:00:00 2001 From: lltcggie Date: Wed, 6 Jul 2016 12:27:03 +0900 Subject: [PATCH] =?UTF-8?q?CPU=E3=83=A2=E3=83=BC=E3=83=89=E3=81=A7?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B=E3=81=A8=E5=BC=B7=E5=88=B6?= =?UTF-8?q?=E7=B5=82=E4=BA=86=E3=81=99=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/waifu2x.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp index 73e0023..9263983 100644 --- a/common/waifu2x.cpp +++ b/common/waifu2x.cpp @@ -732,11 +732,15 @@ Waifu2x::eWaifu2xError Waifu2x::ProcessNet(std::shared_ptr net, const int if (OutputMemorySize > mOutputBlockSize) { if (mIsCuda) + { CUDA_HOST_SAFE_FREE(mOutputBlock); + CUDA_CHECK_WAIFU2X(cudaHostAlloc(&mOutputBlock, OutputMemorySize, cudaHostAllocDefault)); + } else + { SAFE_DELETE_WAIFU2X(mOutputBlock); - - CUDA_CHECK_WAIFU2X(cudaHostAlloc(&mOutputBlock, OutputMemorySize, cudaHostAllocDefault)); + mOutputBlock = new float[OutputMemorySize]; + } mOutputBlockSize = OutputMemorySize; }