Skip to content
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.

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

Eliminating few compile time warnings #307

Open
wants to merge 116 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
613174f
Update main.cpp
shleym2000 Apr 9, 2024
8e2d037
Merge branch 'dev' into patch-5
Apr 17, 2024
083a760
Merge branch 'dev' into patch-5
shleym2000 Apr 20, 2024
c138000
Merge branch 'dev' into patch-5
Apr 29, 2024
4062f0c
Merge branch 'dev' into patch-5
May 1, 2024
44c4973
Merge branch 'dev' into patch-5
shleym2000 May 4, 2024
6588d91
Merge branch 'dev' into patch-5
shleym2000 May 15, 2024
7dfb203
Merge branch 'dev' into patch-5
shleym2000 May 17, 2024
c0c7eef
Eliminating few warnings
shleym2000 May 17, 2024
1e74f21
Merge branch 'dev' into patch-5
May 21, 2024
2fd6917
Merge branch 'dev' into patch-5
shleym2000 May 31, 2024
6d3cbd8
Eliminate type mismatch warning
shleym2000 Jun 9, 2024
ed9447f
Eliminated warning
Jun 10, 2024
bc848b2
Simplify local header file inclusion
Jun 10, 2024
720e186
Merge branch 'dev' into patch-5
Jun 10, 2024
3cc9383
Merge branch 'dev' into patch-5
Jun 17, 2024
79f133a
Merge branch 'dev' into patch-5
shleym2000 Jun 18, 2024
9ec0dd1
Merge branch 'dev' into patch-5
shleym2000 Jun 19, 2024
88ed87f
Merge branch 'dev' into patch-5
Jun 21, 2024
9608ca1
Compile without CUDA by default
Jun 21, 2024
ef32fdd
Eliminating warnings
Jun 21, 2024
e0d0470
Fixing build
Jun 21, 2024
100cbd4
removed warnings
Jun 21, 2024
5f26b26
Merge branch 'dev' into patch-5
Jun 24, 2024
dc4d813
Merge branch 'dev' into patch-5
shleym2000 Jul 4, 2024
ea4f538
Merge branch 'dev' into patch-5
Jul 5, 2024
6e65215
Merge branch 'dev' into patch-5
shleym2000 Jul 10, 2024
13a7ae7
Type adjustment
shleym2000 Jul 10, 2024
51bfb1f
Merge branch 'dev' into patch-5
shleym2000 Jul 11, 2024
9ea152c
Merge branch 'dev' into patch-5
Jul 15, 2024
b52dcfd
Merge branch 'dev' into patch-5
shleym2000 Jul 17, 2024
5a16188
minor fix
Jul 17, 2024
19e157b
Merge branch 'dev' into patch-5
shleym2000 Jul 20, 2024
83e2d2c
No changes in loss_index.cpp are needed anymore
shleym2000 Jul 20, 2024
d92ad8f
Merge branch 'dev' into patch-5
Jul 22, 2024
0428a25
One more preventable type mismatch
Jul 22, 2024
f675e6d
Merge branch 'dev' into patch-5
Jul 23, 2024
029d121
Merge branch 'dev' into patch-5
Jul 24, 2024
76de238
Merge branch 'dev' into patch-5
Jul 24, 2024
b3e77ce
Remove warning
Jul 24, 2024
694aefc
One more fix to warnings
Jul 24, 2024
92594f4
Merge branch 'dev' into patch-5
Jul 25, 2024
70f451d
Header is not needed and not working
Jul 25, 2024
82edbff
minor fix
Jul 25, 2024
254f78d
Fixing 4 mistakes in test's code
Jul 25, 2024
b5cf377
Merge branch 'dev' into patch-5
Jul 26, 2024
9e17625
Merge branch 'dev' into patch-5
shleym2000 Jul 27, 2024
4a7a380
synch
shleym2000 Jul 27, 2024
8b15640
warning eliminated
shleym2000 Jul 27, 2024
d8222a0
Merge branch 'dev' into patch-5
Jul 29, 2024
13c5cb1
Merge branch 'dev' into patch-5
Jul 30, 2024
8106eaf
Minor
Jul 30, 2024
864bfbc
merge
shleym2000 Jul 31, 2024
b70466b
Merging
shleym2000 Jul 31, 2024
cc48d67
Merge branch 'dev' into patch-5
Aug 1, 2024
241f4c8
Cleanup
Aug 1, 2024
d570c93
Merge branch 'dev' into patch-5
shleym2000 Aug 5, 2024
984f03d
Merge branch 'dev' into patch-5
Aug 9, 2024
810dda7
Merge branch 'dev' into patch-5
Aug 12, 2024
df09392
Merge branch 'dev' into patch-5
Aug 14, 2024
e2fcae7
no changes to this file needed
Aug 14, 2024
1551a13
header path is corrected
Aug 14, 2024
176787d
Merge branch 'dev' into patch-5
Aug 15, 2024
fc11c49
Restore compilability
Aug 15, 2024
909ffc6
Merge branch 'dev' into patch-5
Aug 16, 2024
de10e52
Merge branch 'dev' into patch-5
shleym2000 Aug 17, 2024
b50d21b
Compilable in Debug mode
shleym2000 Aug 18, 2024
09e63d2
Merge branch 'dev' into patch-5
Aug 19, 2024
f09dccc
Merge branch 'dev' into patch-5
shleym2000 Aug 20, 2024
f9bd45b
Merge branch 'dev' into patch-5
shleym2000 Aug 24, 2024
b1297f0
Merge branch 'dev' into patch-5
Aug 26, 2024
a828d5e
Merge branch 'dev' into patch-5
shleym2000 Aug 27, 2024
e0fdf8e
Merge branch 'dev' into patch-5
Aug 29, 2024
24c957e
Merge branch 'dev' into patch-5
Sep 5, 2024
61172d9
Merge branch 'dev' into patch-5
Sep 6, 2024
3671946
Merge branch 'dev' into patch-5
Sep 12, 2024
ab17450
Merge branch 'dev' into patch-5
Sep 13, 2024
ed88a87
Merge branch 'dev' into patch-5
Sep 13, 2024
77fd300
Merge branch 'dev' into patch-5
Sep 16, 2024
247491b
Minor change
Sep 16, 2024
57fc249
Merge branch 'dev' into patch-5
Sep 17, 2024
d880927
Merge branch 'dev' into patch-5
Sep 18, 2024
6d0bbe9
Merge branch 'dev' into patch-5
Sep 19, 2024
ed82deb
Merge branch 'dev' into patch-5
shleym2000 Sep 21, 2024
8dea3cd
Merge branch 'dev' into patch-5
shleym2000 Sep 23, 2024
61abe5a
Merge branch 'dev' into patch-5
Sep 25, 2024
05aaead
Merge branch 'dev' into patch-5
Sep 25, 2024
84b4dc0
Merge branch 'dev' into patch-5
shleym2000 Sep 29, 2024
2894c4b
Merge branch 'dev' into patch-5
Sep 30, 2024
3871411
Merge branch 'dev' into patch-5
Oct 9, 2024
7a4d2d6
Eliminate few compile-time warnings
Oct 9, 2024
baad85b
Fixing compile error
shleym2000 Oct 10, 2024
0c061a0
Merge branch 'dev' into patch-5
Oct 14, 2024
2771b9a
Merge branch 'dev' into patch-5
Oct 16, 2024
dacc63f
warningd removed in few places
Oct 16, 2024
9d57b43
Merge branch 'dev' into patch-5
shleym2000 Oct 19, 2024
ea87a8c
Fix for warnings
shleym2000 Oct 20, 2024
8fb7d6a
Fix for error
shleym2000 Oct 20, 2024
f9356d4
Merge branch 'dev' into patch-5
Oct 21, 2024
b6e70b4
Merge branch 'dev' into patch-5
shleym2000 Oct 24, 2024
92da65f
Synchronizing
shleym2000 Oct 25, 2024
3be769e
1 warning and 1 error
shleym2000 Oct 25, 2024
f45d51a
Typos corrected
shleym2000 Oct 25, 2024
bde2895
Merge branch 'dev' into patch-5
Oct 25, 2024
207cc71
Merge branch 'dev' into patch-5
shleym2000 Oct 26, 2024
118cdd0
Merge branch 'dev' into patch-5
shleym2000 Oct 26, 2024
ff47654
Merge branch 'dev' into patch-5
shleym2000 Oct 27, 2024
23d3d02
Merge branch 'dev' into patch-5
Oct 28, 2024
51e625f
Merge branch 'dev' into patch-5
Oct 28, 2024
33ff3cd
Merge branch 'dev' into patch-5
shleym2000 Oct 29, 2024
67e1475
Merge branch 'dev' into patch-5
Oct 29, 2024
bcf3274
Merge branch 'dev' into patch-5
Oct 31, 2024
23eee2b
Merge branch 'dev' into patch-5
Nov 4, 2024
349a971
Merge branch 'dev' into patch-5
shleym2000 Nov 5, 2024
0f826f7
Merge branch 'dev' into patch-5
shleym2000 Nov 6, 2024
9086ee7
Merge branch 'dev' into patch-5
shleym2000 Nov 6, 2024
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
Empty file modified blank/main.cpp
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion opennn/batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void Batch::fill(const Tensor<Index, 1>& samples_indices,
ImageDataSet* image_data_set = static_cast<ImageDataSet*>(data_set);
/*
// @TODO
Tensor<type, 2>& augmented_data = perform_augmentation(data);
const Tensor<type, 2>& augmented_data = perform_augmentation(data);

fill_tensor_data(augmented_data, samples_indices, inputs_indices, input_data);
*/
Expand Down
2 changes: 1 addition & 1 deletion opennn/codification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ string sj2utf8(const string &input_string)
//converting to UTF8
if(unicodeValue < 0x80)
{
output[indexOutput++] = unicodeValue;
output[indexOutput++] = char(unicodeValue);
}
else if(unicodeValue < 0x800)
{
Expand Down
2 changes: 1 addition & 1 deletion opennn/perceptron_layer_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void PerceptronLayer3D::add_deltas(const vector<pair<type*, dimensions>>& delta_
{
TensorMap<Tensor<type, 3>> deltas = tensor_map_3(delta_pairs[0]);

for(Index i = 1; i < Index(delta_pairs.size()); i++)
for(Index i = 1; i < static_cast<Index>(delta_pairs.size()); i++)
deltas.device(*thread_pool_device) += tensor_map_3(delta_pairs[i]);
}

Expand Down
2 changes: 1 addition & 1 deletion opennn/probabilistic_layer_3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ProbabilisticLayer3D : public Layer

explicit ProbabilisticLayer3D(const Index& = 0, const Index& = 0, const Index& = 0);

enum class ActivationFunction{Softmax, Competitive};
enum class ActivationFunction{Softmax, Competitive, Binary, Logistic};

Index get_inputs_number() const;
Index get_inputs_depth() const;
Expand Down
6 changes: 4 additions & 2 deletions opennn/time_series_data_set.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,16 @@ Tensor<DataSet::RawVariable, 1> TimeSeriesDataSet::get_time_series_raw_variables
const string& TimeSeriesDataSet::get_time_raw_variable() const
{
//return time_column; @todo
return "";
static const string empty("");
return empty;
}


const string& TimeSeriesDataSet::get_group_by_column() const
{
//return group_by_column; @todo
return string();
static const string empty;
return empty;
}


Expand Down
8 changes: 4 additions & 4 deletions tests/response_optimization_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void ResponseOptimizationTest::test_perform_optimization()
results = response_optimization.perform_optimization();
assert_true(results->optimal_variables(0) = 1, LOG);
assert_true(results->optimal_variables(1) <= 1, LOG);
assert_true(1 <= results->optimal_variables(2) <= 2.5, LOG);
assert_true((1 <= results->optimal_variables(2)) && (results->optimal_variables(2) <= 2.5), LOG);

// Multiple outputs case 1

Expand All @@ -111,8 +111,8 @@ void ResponseOptimizationTest::test_perform_optimization()
results = response_optimization.perform_optimization();
assert_true(results->optimal_variables(0) = 1, LOG);
assert_true(results->optimal_variables(1) <= 1, LOG);
assert_true(1 <= results->optimal_variables(2) <= 3.0, LOG);
assert_true(-1 <= results->optimal_variables(3) <= type(1), LOG);
assert_true((1 <= results->optimal_variables(2)) && (results->optimal_variables(2) <= 3.0), LOG);
assert_true((-1 <= results->optimal_variables(3)) && (results->optimal_variables(3) <= type(1)), LOG);

// Multiple outputs case 2

Expand All @@ -131,7 +131,7 @@ void ResponseOptimizationTest::test_perform_optimization()
results = response_optimization.perform_optimization();
assert_true(results->optimal_variables(0) = 1, LOG);
assert_true(results->optimal_variables(1) <= 1, LOG);
assert_true(1 <= results->optimal_variables(2) <= 2.0, LOG);
assert_true((1 <= results->optimal_variables(2)) && (results->optimal_variables(2) <= 2.0), LOG);
assert_true(type(-1) <= results->optimal_variables(3), LOG);
assert_true(results->optimal_variables(3) <= type(0), LOG);

Expand Down
2 changes: 1 addition & 1 deletion tests/statistics_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// [email protected]

#include "statistics_test.h"
#include "strings_utilities.h"
#include "../opennn/strings_utilities.h"

#include "../opennn/statistics.h"
#include "../opennn/histogram.h"
Expand Down