Skip to content

Make generic.cmake no longer depend on util.cmake#2326

Merged
gangliao merged 2 commits intoPaddlePaddle:developfrom
wangkuiyi:fix_deps_generic_cmake
Jun 1, 2017
Merged

Make generic.cmake no longer depend on util.cmake#2326
gangliao merged 2 commits intoPaddlePaddle:developfrom
wangkuiyi:fix_deps_generic_cmake

Conversation

@wangkuiyi
Copy link
Collaborator

@wangkuiyi wangkuiyi commented May 31, 2017

Fixes #2324
Fixes #2223
Fixes #2322
Fixes #2321

I tested this PR by

  1. starting a development container

    cd ~/work/paddle
    git checkout develop 
    git pull
    docker build -t paddle:dev .
    docker run --rm -it -v $PWD:/paddle paddle:dev /bin/bash

    and

  2. build paddle/majel inside the container

    cd /paddle/build
    rm CMakeCache*
    cmake -DCUDNN_ROOT=/usr ..
    make -j place_test ddim_test dim_test cuda_test
    ctest -R place_test
    ctest -R ddim_test
@wangkuiyi wangkuiyi requested review from gangliao and helinwang May 31, 2017 21:59
@wangkuiyi
Copy link
Collaborator Author

@gangliao Some my ideas for the future noted at #2327. Could you please read and verify?

Copy link
Contributor

@helinwang helinwang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

Copy link
Contributor

@gangliao gangliao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gangliao gangliao merged commit fb43408 into PaddlePaddle:develop Jun 1, 2017
@wangkuiyi wangkuiyi deleted the fix_deps_generic_cmake branch June 1, 2017 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants