Skip to content

fix compile with on_release off #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2018
Merged

fix compile with on_release off #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2238b0c
fix compile with on_release off
Superjomn Jan 12, 2018
598c6ad
Merge branch 'develop' into bugfix/flag_release_off
Superjomn Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/storage)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/logic)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/python)

# compile test only in release mode
if (NOT ON_RELEASE)
add_executable(vl_test
${PROJECT_SOURCE_DIR}/visualdl/test.cc
Expand Down
2 changes: 1 addition & 1 deletion visualdl/logic/im.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "visualdl/utils/logging.h"
#include <ctime>

#include "visualdl/logic/im.h"
#include "visualdl/storage/entry.h"
#include "visualdl/storage/storage.h"
#include "visualdl/storage/tablet.h"
#include "visualdl/utils/logging.h"

namespace visualdl {

Expand Down
2 changes: 1 addition & 1 deletion visualdl/logic/im.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#ifndef VISUALDL_LOGIC_IM_H
#define VISUALDL_LOGIC_IM_H

#include "visualdl/utils/logging.h"
#include <memory>
#include <mutex>
#include <string>

#include "visualdl/utils/concurrency.h"
#include "visualdl/utils/guard.h"
#include "visualdl/utils/logging.h"

namespace visualdl {

Expand Down
2 changes: 1 addition & 1 deletion visualdl/utils/image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef VISUALDL_UTILS_IMAGE_H
#define VISUALDL_UTILS_IMAGE_H

#include "visualdl/utils/logging.h"
#include <Eigen/Core>
#include <unsupported/Eigen/CXX11/Tensor>
#include "visualdl/utils/logging.h"

namespace visualdl {

Expand Down
11 changes: 1 addition & 10 deletions visualdl/utils/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string>

#if defined(VISUALDL_WITH_GLOG)
#include "visualdl/utils/logging.h"
#include <glog/logging.h>
#endif

namespace visualdl {
Expand Down Expand Up @@ -110,15 +110,6 @@ class NotImplementedException : public std::logic_error {
NotImplementedException() : std::logic_error{"Function not implemented"} {}
};

static void SignalHandler(int sig) {
LOG(INFO) << "get signal " << sig;
exit(sig);
}

struct __once_caller__ {
__once_caller__() { std::signal(SIGINT, SignalHandler); }
};

} // namespace log

} // namespace visualdl
Expand Down