From 30fdc38d20d4e38908059b6e351c550de5741621 Mon Sep 17 00:00:00 2001
From: Nick Foster
Date: Thu, 12 May 2011 14:21:17 -0700
Subject: Volk: profiling works. loads prefs on init. volk_rank_archs looks in
 prefs first.

---
 volk/apps/CMakeLists.txt  |  1 -
 volk/apps/volk_profile.cc | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'volk/apps')

diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt
index 752cbc679..a0bf7e900 100644
--- a/volk/apps/CMakeLists.txt
+++ b/volk/apps/CMakeLists.txt
@@ -33,7 +33,6 @@ INCLUDE_DIRECTORIES(
 ADD_EXECUTABLE(volk_profile
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
     ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
-    ${CMAKE_SOURCE_DIR}/lib/volk_prefs.cc
 )
 
 TARGET_LINK_LIBRARIES(volk_profile volk ${Boost_LIBRARIES})
diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc
index eb7b70887..49e6db3fc 100644
--- a/volk/apps/volk_profile.cc
+++ b/volk/apps/volk_profile.cc
@@ -1,6 +1,8 @@
 #include "qa_utils.h"
+extern "C" {
 #include <volk/volk.h>
 #include <volk/volk_prefs.h>
+}
 #include <vector>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -9,8 +11,10 @@
 int main(int argc, char *argv[]) {
 
     std::vector<std::string> results;
-    std::string config_path = get_config_path();    
-/*
+    char path[256];
+    get_config_path(path);
+    std::string config_path(path);    
+
     //VOLK_PROFILE(volk_16i_x5_add_quad_16i_x4_a16, 1e-4, 2046, 10000, &results);
     //VOLK_PROFILE(volk_16i_branch_4_state_8_a16, 1e-4, 2046, 10000, &results);
     VOLK_PROFILE(volk_16ic_s32f_deinterleave_real_32f_a16, 1e-5, 32768.0, 204600, 10000, &results);
@@ -97,7 +101,6 @@ int main(int argc, char *argv[]) {
     VOLK_PROFILE(volk_8ic_x2_s32f_multiply_conjugate_32fc_a16, 1e-4, 100, 204600, 400, &results);
     VOLK_PROFILE(volk_8i_convert_16i_a16, 0, 0, 204600, 20000, &results);
     VOLK_PROFILE(volk_8i_convert_16i_u, 0, 0, 204600, 2000, &results);
-*/
     VOLK_PROFILE(volk_8i_s32f_convert_32f_a16, 1e-4, 100, 204600, 2000, &results);
     VOLK_PROFILE(volk_8i_s32f_convert_32f_u, 1e-4, 100, 204600, 2000, &results);
 
@@ -114,6 +117,4 @@ int main(int argc, char *argv[]) {
         config << result << std::endl;
     }
     config.close();
-
-    load_preferences();
 }
-- 
cgit