13 files changed, 16 insertions, 16 deletions
diff --git a/aten/src/meter/APMeter.cc b/aten/src/meter/APMeter.cc
index 4be57f2edc..2233b3b584 100644
--- a/aten/src/meter/APMeter.cc
+++ b/aten/src/meter/APMeter.cc
@@ -2,7 +2,7 @@
 #include <math.h>
 #include <cassert>
 
-using namespace tlib;
+using namespace at;
 
 APMeter::APMeter() {
    reset();
diff --git a/aten/src/meter/APMeter.h b/aten/src/meter/APMeter.h
index 12faa9219e..e93281d420 100644
--- a/aten/src/meter/APMeter.h
+++ b/aten/src/meter/APMeter.h
@@ -2,7 +2,7 @@
 #define XT_AP_METER_H
 
 #include "Meter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
 class APMeter : public Meter
 {
diff --git a/aten/src/meter/AUCMeter.cc b/aten/src/meter/AUCMeter.cc
index b133405daa..f045a40390 100644
--- a/aten/src/meter/AUCMeter.cc
+++ b/aten/src/meter/AUCMeter.cc
@@ -2,7 +2,7 @@
 #include "APMeter.h"
 #include <cassert>
 
-using namespace tlib;
+using namespace at;
 
 AUCMeter::AUCMeter() {
    reset();
@@ -44,7 +44,7 @@ void AUCMeter::value(Tensor& val) {
       }
    }
    tpr.div_(sum(targets));
-   fpr.div_(sum(tlib::add(mul(targets, -1.), 1.)));
+   fpr.div_(sum(at::add(mul(targets, -1.), 1.)));
 
    /**
    local auc = torch.cmul(
diff --git a/aten/src/meter/AUCMeter.h b/aten/src/meter/AUCMeter.h
index 2db468d909..524284c647 100644
--- a/aten/src/meter/AUCMeter.h
+++ b/aten/src/meter/AUCMeter.h
@@ -3,7 +3,7 @@
 
 #include "Meter.h"
 #include "APMeter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
 class AUCMeter : public Meter
 {
diff --git a/aten/src/meter/CMakeLists.txt b/aten/src/meter/CMakeLists.txt
index d994caa842..8fef567609 100644
--- a/aten/src/meter/CMakeLists.txt
+++ b/aten/src/meter/CMakeLists.txt
@@ -18,7 +18,7 @@ set(src
 )
 
 add_library(xtmeter SHARED ${src})
-target_link_libraries(xtmeter TensorLib)
+target_link_libraries(xtmeter ATen)
 
 add_executable(test-meter test/basic.cc ${BACKWARD_ENABLE})
 # add_backward(test-meter)
diff --git a/aten/src/meter/ClassErrorMeter.cc b/aten/src/meter/ClassErrorMeter.cc
index e70f9da97c..1412b42f6c 100644
--- a/aten/src/meter/ClassErrorMeter.cc
+++ b/aten/src/meter/ClassErrorMeter.cc
@@ -1,8 +1,8 @@
 #include "ClassErrorMeter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 #include <cassert>
 
-using namespace tlib;
+using namespace at;
 
 ClassErrorMeter::ClassErrorMeter() {
    ClassErrorMeter(1);
diff --git a/aten/src/meter/ClassErrorMeter.h b/aten/src/meter/ClassErrorMeter.h
index a81663cca5..c61cd13d97 100644
--- a/aten/src/meter/ClassErrorMeter.h
+++ b/aten/src/meter/ClassErrorMeter.h
@@ -2,7 +2,7 @@
 #define XT_CLASS_ERROR_METER_H
 
 #include "Meter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
 class ClassErrorMeter : public Meter
 {
diff --git a/aten/src/meter/MAPMeter.cc b/aten/src/meter/MAPMeter.cc
index 807fe640d2..a73c541d5e 100644
--- a/aten/src/meter/MAPMeter.cc
+++ b/aten/src/meter/MAPMeter.cc
@@ -1,6 +1,6 @@
 #include "MAPMeter.h"
 
-using namespace tlib;
+using namespace at;
 
 MAPMeter::MAPMeter() {
    reset();
diff --git a/aten/src/meter/MAPMeter.h b/aten/src/meter/MAPMeter.h
index 898929b524..3ec8e94a31 100644
--- a/aten/src/meter/MAPMeter.h
+++ b/aten/src/meter/MAPMeter.h
@@ -3,7 +3,7 @@
 
 #include "Meter.h"
 #include "APMeter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
 class MAPMeter : public Meter
 {
diff --git a/aten/src/meter/MSEMeter.cc b/aten/src/meter/MSEMeter.cc
index 195233bb56..012b6b8b0c 100644
--- a/aten/src/meter/MSEMeter.cc
+++ b/aten/src/meter/MSEMeter.cc
@@ -2,7 +2,7 @@
 #include <cassert>
 #include <math.h>
 
-using namespace tlib;
+using namespace at;
 
 MSEMeter::MSEMeter() {
    reset();
diff --git a/aten/src/meter/MSEMeter.h b/aten/src/meter/MSEMeter.h
index 867ccef41b..19c92a8c23 100644
--- a/aten/src/meter/MSEMeter.h
+++ b/aten/src/meter/MSEMeter.h
@@ -2,7 +2,7 @@
 #define XT_MSE_METER_H
 
 #include "Meter.h"
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
 class MSEMeter : public Meter
 {
diff --git a/aten/src/meter/Meter.h b/aten/src/meter/Meter.h
index 9de23fd242..55ba34e6f0 100644
--- a/aten/src/meter/Meter.h
+++ b/aten/src/meter/Meter.h
@@ -1,9 +1,9 @@
 #ifndef XT_METER_H
 #define XT_METER_H
 
-#include "TensorLib/TensorLib.h"
+#include "ATen/ATen.h"
 
-using namespace tlib;
+using namespace at;
 
 class Meter
 {
diff --git a/aten/src/meter/test/basic.cc b/aten/src/meter/test/basic.cc
index 7f3523bc76..8a39cabeda 100644
--- a/aten/src/meter/test/basic.cc
+++ b/aten/src/meter/test/basic.cc
@@ -1,7 +1,7 @@
 #include "APMeter.h"
 #include <iostream>
 
-using namespace tlib;
+using namespace at;
 
 int main()
 {